diff --git a/.github/workflows/openclaw-plugin-publish.yml b/.github/workflows/openclaw-plugin-publish.yml
index 5c79e5ad5..54375f0ae 100644
--- a/.github/workflows/openclaw-plugin-publish.yml
+++ b/.github/workflows/openclaw-plugin-publish.yml
@@ -100,7 +100,8 @@ jobs:
           MEMOS_ARMS_ENV: ${{ secrets.MEMOS_ARMS_ENV }}
 
       - name: Bump version
-        run: npm version ${{ inputs.version }} --no-git-tag-version
+        # Branch may already have this version in package.json (e.g. after a prior merge); npm errors without this flag.
+        run: npm version ${{ inputs.version }} --no-git-tag-version --allow-same-version
 
       - name: Publish to npm
         run: npm publish --access public --tag ${{ inputs.tag }}
@@ -113,6 +114,8 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add apps/memos-local-openclaw/package.json
-          git commit -m "release: openclaw-plugin v${{ inputs.version }}"
+          if ! git diff --staged --quiet; then
+            git commit -m "release: openclaw-plugin v${{ inputs.version }}"
+          fi
           git tag "openclaw-plugin-v${{ inputs.version }}"
           git push origin HEAD --tags
diff --git a/apps/memos-local-openclaw/index.ts b/apps/memos-local-openclaw/index.ts
index c4ee84bba..30e03439b 100644
--- a/apps/memos-local-openclaw/index.ts
+++ b/apps/memos-local-openclaw/index.ts
@@ -31,18 +31,6 @@ import { SkillInstaller } from "./src/skill/installer";
 import { Summarizer } from "./src/ingest/providers";
 import { MEMORY_GUIDE_SKILL_MD } from "./src/skill/bundled-memory-guide";
 import { Telemetry } from "./src/telemetry";
-import {
-  type AgentMessage as CEAgentMessage,
-  type PendingInjection,
-  deduplicateHits as ceDeduplicateHits,
-  formatMemoryBlock,
-  appendMemoryToMessage,
-  removeExistingMemoryBlock,
-  messageHasMemoryBlock,
-  getTextFromMessage,
-  insertSyntheticAssistantEntry,
-  findTargetAssistantEntry,
-} from "./src/context-engine";
 
 
 /** Remove near-duplicate hits based on summary word overlap (>70%). Keeps first (highest-scored) hit. */
@@ -65,6 +53,45 @@ function deduplicateHits<T extends { summary: string }>(hits: T[]): T[] {
   return kept;
 }
 
+const NEW_SESSION_PROMPT_RE = /A new session was started via \/new or \/reset\./i;
+const INTERNAL_CONTEXT_RE = /OpenClaw runtime context \(internal\):[\s\S]*/i;
+const CONTINUE_PROMPT_RE = /^Continue where you left off\.[\s\S]*/i;
+
+function normalizeAutoRecallQuery(rawPrompt: string): string {
+  let query = rawPrompt.trim();
+
+  const senderTag = "Sender (untrusted metadata):";
+  const senderPos = query.indexOf(senderTag);
+  if (senderPos !== -1) {
+    const afterSender = query.slice(senderPos);
+    const fenceStart = afterSender.indexOf("```json");
+    const fenceEnd = fenceStart >= 0 ? afterSender.indexOf("```\n", fenceStart + 7) : -1;
+    if (fenceEnd > 0) {
+      query = afterSender.slice(fenceEnd + 4).replace(/^\s*\n/, "").trim();
+    } else {
+      const firstDblNl = afterSender.indexOf("\n\n");
+      if (firstDblNl > 0) {
+        query = afterSender.slice(firstDblNl + 2).trim();
+      }
+    }
+  }
+
+  query = stripInboundMetadata(query);
+  query = query.replace(/<[^>]+>/g, "").trim();
+
+  if (NEW_SESSION_PROMPT_RE.test(query)) {
+    query = query.replace(NEW_SESSION_PROMPT_RE, "").trim();
+    query = query.replace(/^(Execute|Run) your Session Startup sequence[^\n]*\n?/im, "").trim();
+    query = query.replace(/^Current time:[^\n]*(\n|$)/im, "").trim();
+  }
+
+  query = query.replace(INTERNAL_CONTEXT_RE, "").trim();
+  query = query.replace(CONTINUE_PROMPT_RE, "").trim();
+
+  return query;
+}
+
+
 const pluginConfigSchema = {
   type: "object" as const,
   additionalProperties: true,
@@ -290,7 +317,7 @@ const memosLocalPlugin = {
         const raw = fs.readFileSync(openclawJsonPath, "utf-8");
         const cfg = JSON.parse(raw);
         const allow: string[] | undefined = cfg?.tools?.allow;
-        if (Array.isArray(allow) && allow.length > 0 && !allow.includes("group:plugins")) {
+        if (Array.isArray(allow) && allow.length > 0 && !allow.includes("group:plugins") && !allow.includes("*")) {
           const lastEntry = JSON.stringify(allow[allow.length - 1]);
           const patched = raw.replace(
             new RegExp(`(${lastEntry})(\\s*\\])`),
@@ -319,6 +346,7 @@ const memosLocalPlugin = {
     // Current agent ID — updated by hooks, read by tools for owner isolation.
     // Falls back to "main" when no hook has fired yet (single-agent setups).
     let currentAgentId = "main";
+    const getCurrentOwner = () => `agent:${currentAgentId}`;
 
     // ─── Check allowPromptInjection policy ───
     // When allowPromptInjection=false, the prompt mutation fields (such as prependContext) in the hook return value
@@ -332,214 +360,6 @@ const memosLocalPlugin = {
       api.logger.info("memos-local: allowPromptInjection=true, auto-recall enabled");
     }
 
-    // ─── Context Engine: inject memories into assistant messages ───
-    // Memories are wrapped in <relevant-memories> tags which OpenClaw's UI
-    // automatically strips from assistant messages, keeping the chat clean.
-    // Persisted to the session file so the prompt prefix stays stable for KV cache.
-
-    let pendingInjection: PendingInjection | null = null;
-
-    try {
-      api.registerContextEngine("memos-local-openclaw-plugin", () => ({
-        info: {
-          id: "memos-local-openclaw-plugin",
-          name: "MemOS Local Memory Context Engine",
-          version: "1.0.0",
-        },
-
-        async ingest() {
-          return { ingested: false };
-        },
-
-        async assemble(params: {
-          sessionId: string;
-          sessionKey?: string;
-          messages: CEAgentMessage[];
-          tokenBudget?: number;
-          model?: string;
-          prompt?: string;
-        }) {
-          const { messages, prompt, sessionId, sessionKey } = params;
-
-          if (!allowPromptInjection || !prompt || prompt.length < 3) {
-            return { messages, estimatedTokens: 0 };
-          }
-
-          const recallT0 = performance.now();
-          try {
-            let query = prompt;
-            const senderTag = "Sender (untrusted metadata):";
-            const senderPos = query.indexOf(senderTag);
-            if (senderPos !== -1) {
-              const afterSender = query.slice(senderPos);
-              const fenceStart = afterSender.indexOf("```json");
-              const fenceEnd = fenceStart >= 0 ? afterSender.indexOf("```\n", fenceStart + 7) : -1;
-              if (fenceEnd > 0) {
-                query = afterSender.slice(fenceEnd + 4).replace(/^\s*\n/, "").trim();
-              } else {
-                const firstDblNl = afterSender.indexOf("\n\n");
-                if (firstDblNl > 0) {
-                  query = afterSender.slice(firstDblNl + 2).trim();
-                }
-              }
-            }
-            query = stripInboundMetadata(query).replace(/<[^>]+>/g, "").trim();
-
-            if (query.length < 2) {
-              return { messages, estimatedTokens: 0 };
-            }
-
-            ctx.log.debug(`context-engine assemble: query="${query.slice(0, 80)}"`);
-
-            const recallOwner = [`agent:${currentAgentId}`, "public"];
-            const result = await engine.search({ query, maxResults: 10, minScore: 0.45, ownerFilter: recallOwner });
-            const filteredHits = ceDeduplicateHits(
-              result.hits.filter((h: SearchHit) => h.score >= 0.5),
-            );
-
-            if (filteredHits.length === 0) {
-              ctx.log.debug("context-engine assemble: no memory hits");
-              return { messages, estimatedTokens: 0 };
-            }
-
-            const memoryBlock = formatMemoryBlock(filteredHits);
-            const cloned: CEAgentMessage[] = messages.map((m) => structuredClone(m));
-
-            let lastAssistantIdx = -1;
-            for (let i = cloned.length - 1; i >= 0; i--) {
-              if (cloned[i].role === "assistant") {
-                lastAssistantIdx = i;
-                break;
-              }
-            }
-
-            const sk = sessionKey ?? sessionId;
-
-            if (lastAssistantIdx < 0) {
-              const syntheticAssistant: CEAgentMessage = {
-                role: "assistant",
-                content: [{ type: "text", text: memoryBlock }],
-                timestamp: Date.now(),
-                stopReason: "end_turn",
-                usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, totalTokens: 0 },
-              };
-              pendingInjection = { sessionKey: sk, memoryBlock, isSynthetic: true };
-              ctx.log.info(`context-engine assemble: first turn, injecting synthetic assistant (${filteredHits.length} memories)`);
-              return { messages: [...cloned, syntheticAssistant], estimatedTokens: 0 };
-            }
-
-            removeExistingMemoryBlock(cloned[lastAssistantIdx]);
-            appendMemoryToMessage(cloned[lastAssistantIdx], memoryBlock);
-            pendingInjection = { sessionKey: sk, memoryBlock, isSynthetic: false };
-
-            const dur = performance.now() - recallT0;
-            ctx.log.info(`context-engine assemble: injected ${filteredHits.length} memories into assistant[${lastAssistantIdx}] (${dur.toFixed(0)}ms)`);
-            return { messages: cloned, estimatedTokens: 0 };
-          } catch (err) {
-            ctx.log.warn(`context-engine assemble failed: ${err}`);
-            return { messages, estimatedTokens: 0 };
-          }
-        },
-
-        async afterTurn() {},
-
-        async compact(params: any) {
-          try {
-            const { delegateCompactionToRuntime } = await import("openclaw/plugin-sdk");
-            return await delegateCompactionToRuntime(params);
-          } catch {
-            return { ok: true, compacted: false, reason: "delegateCompactionToRuntime not available" };
-          }
-        },
-
-        async maintain(params: {
-          sessionId: string;
-          sessionKey?: string;
-          sessionFile: string;
-          runtimeContext?: { rewriteTranscriptEntries?: (req: any) => Promise<any> };
-        }) {
-          const noChange = { changed: false, bytesFreed: 0, rewrittenEntries: 0 };
-
-          if (!pendingInjection) return noChange;
-
-          const sk = params.sessionKey ?? params.sessionId;
-          if (pendingInjection.sessionKey !== sk) {
-            pendingInjection = null;
-            return { ...noChange, reason: "session mismatch" };
-          }
-
-          try {
-            if (pendingInjection.isSynthetic) {
-              // First turn: INSERT synthetic assistant before existing entries
-              const { SessionManager } = await import("@mariozechner/pi-coding-agent");
-              const sm = SessionManager.open(params.sessionFile);
-              const ok = insertSyntheticAssistantEntry(sm, pendingInjection.memoryBlock);
-              pendingInjection = null;
-              if (ok) {
-                ctx.log.info("context-engine maintain: persisted synthetic assistant message");
-                return { changed: true, bytesFreed: 0, rewrittenEntries: 1 };
-              }
-              return { ...noChange, reason: "empty branch, could not insert synthetic" };
-            }
-
-            // Subsequent turns: REPLACE last assistant entry with memory-injected version
-            if (!params.runtimeContext?.rewriteTranscriptEntries) {
-              pendingInjection = null;
-              return { ...noChange, reason: "rewriteTranscriptEntries not available" };
-            }
-
-            const { SessionManager } = await import("@mariozechner/pi-coding-agent");
-            const sm = SessionManager.open(params.sessionFile);
-            const branch = sm.getBranch();
-            const targetEntry = findTargetAssistantEntry(branch);
-
-            if (!targetEntry) {
-              pendingInjection = null;
-              return { ...noChange, reason: "no target assistant entry found" };
-            }
-
-            const modifiedMessage = structuredClone(targetEntry.message!);
-            removeExistingMemoryBlock(modifiedMessage as CEAgentMessage);
-            appendMemoryToMessage(modifiedMessage as CEAgentMessage, pendingInjection.memoryBlock);
-
-            const result = await params.runtimeContext.rewriteTranscriptEntries({
-              replacements: [{ entryId: targetEntry.id, message: modifiedMessage }],
-            });
-
-            ctx.log.info(`context-engine maintain: persisted memory to assistant entry ${targetEntry.id}`);
-            pendingInjection = null;
-            return result;
-          } catch (err) {
-            ctx.log.warn(`context-engine maintain failed: ${err}`);
-            pendingInjection = null;
-            return { ...noChange, reason: String(err) };
-          }
-        },
-      }));
-
-      ctx.log.info("memos-local: registered context engine 'memos-local-openclaw-plugin'");
-    } catch (err) {
-      ctx.log.warn(`memos-local: context engine registration failed (${err}), memory injection will use before_prompt_build fallback`);
-    }
-
-    // ─── Memory Prompt Section: static instructions for the LLM ───
-    try {
-      api.registerMemoryPromptSection(() => [
-        "## Memory System",
-        "",
-        "Assistant messages in this conversation may contain <relevant-memories> blocks.",
-        "These are NOT part of the assistant's original response.",
-        "They contain background knowledge and memories relevant to the next user message,",
-        "injected by the user's local memory system before each query.",
-        "Use them as context to better understand and respond to the following user message.",
-        "Do not mention, quote, or repeat these memory blocks in your replies.",
-        "",
-      ]);
-      ctx.log.info("memos-local: registered memory prompt section");
-    } catch (err) {
-      ctx.log.warn(`memos-local: registerMemoryPromptSection failed: ${err}`);
-    }
-
     const trackTool = (toolName: string, fn: (...args: any[]) => Promise<any>) =>
       async (...args: any[]) => {
         const t0 = performance.now();
@@ -574,7 +394,6 @@ const memosLocalPlugin = {
         }
       };
 
-    const getCurrentOwner = () => `agent:${currentAgentId}`;
     const resolveMemorySearchScope = (scope?: string): "local" | "group" | "all" =>
       scope === "group" || scope === "all" ? scope : "local";
     const resolveMemoryShareTarget = (target?: string): "agents" | "hub" | "both" =>
@@ -608,6 +427,7 @@ const memosLocalPlugin = {
         body: JSON.stringify({
           memory: {
             sourceChunkId: chunk.id,
+            sourceAgent: chunk.owner || "",
             role: chunk.role,
             content: chunk.content,
             summary: chunk.summary,
@@ -628,6 +448,7 @@ const memosLocalPlugin = {
           id: memoryId,
           sourceChunkId: chunk.id,
           sourceUserId: hubClient.userId,
+          sourceAgent: chunk.owner || "",
           role: chunk.role,
           content: chunk.content,
           summary: chunk.summary ?? "",
@@ -665,7 +486,7 @@ const memosLocalPlugin = {
     // ─── Tool: memory_search ───
 
     api.registerTool(
-      {
+      (context) => ({
         name: "memory_search",
         label: "Memory Search",
         description:
@@ -681,7 +502,7 @@ const memosLocalPlugin = {
           hubAddress: Type.Optional(Type.String({ description: "Optional Hub address override for group/all search." })),
           userToken: Type.Optional(Type.String({ description: "Optional Hub bearer token override for group/all search." })),
         }),
-        execute: trackTool("memory_search", async (_toolCallId: any, params: any, context?: any) => {
+        execute: trackTool("memory_search", async (_toolCallId: any, params: any) => {
           const {
             query,
             scope: rawScope,
@@ -702,9 +523,6 @@ const memosLocalPlugin = {
           const role = rawRole === "user" || rawRole === "assistant" || rawRole === "tool" || rawRole === "system" ? rawRole : undefined;
           const minScore = typeof rawMinScore === "number" ? Math.max(0.35, Math.min(1, rawMinScore)) : undefined;
           let searchScope = resolveMemorySearchScope(rawScope);
-          if (searchScope === "local" && ctx.config?.sharing?.enabled) {
-            searchScope = "all";
-          }
           const searchLimit = typeof maxResults === "number" ? Math.max(1, Math.min(20, Math.round(maxResults))) : 10;
 
           const agentId = context?.agentId ?? currentAgentId;
@@ -724,7 +542,7 @@ const memosLocalPlugin = {
 
           // Split local results: pure-local vs hub-memory (Hub role's hub_memories mixed in by RecallEngine)
           const localHits = result.hits.filter((h) => h.origin !== "hub-memory");
-          const hubLocalHits = result.hits.filter((h) => h.origin === "hub-memory");
+          const hubLocalHits = searchScope !== "local" ? result.hits.filter((h) => h.origin === "hub-memory") : [];
 
           const rawLocalCandidates = localHits.map((h) => ({
             chunkId: h.ref.chunkId,
@@ -733,6 +551,7 @@ const memosLocalPlugin = {
             summary: h.summary,
             original_excerpt: (h.original_excerpt ?? "").slice(0, 200),
             origin: h.origin || "local",
+            owner: h.owner || "",
           }));
 
           // Hub remote candidates (from HTTP call) + hub-memory candidates (from RecallEngine for Hub role)
@@ -869,6 +688,7 @@ const memosLocalPlugin = {
                 chunkId: h.ref.chunkId, taskId: effectiveTaskId, skillId: h.skillId,
                 role: h.source.role, score: h.score, summary: h.summary,
                 original_excerpt: (h.original_excerpt ?? "").slice(0, 200), origin: h.origin || "local",
+                owner: h.owner || "",
               };
             }),
             ...filteredHubRemoteHits.map((h: any) => ({
@@ -876,6 +696,7 @@ const memosLocalPlugin = {
               role: h.source?.role ?? h.role ?? "assistant", score: h.score ?? 0,
               summary: h.summary ?? "", original_excerpt: (h.excerpt ?? h.summary ?? "").slice(0, 200),
               origin: "hub-remote", ownerName: h.ownerName ?? "", groupName: h.groupName ?? "",
+              sourceAgent: h.sourceAgent ?? "",
             })),
           ];
 
@@ -889,14 +710,14 @@ const memosLocalPlugin = {
             },
           };
         }),
-      },
+      }),
       { name: "memory_search" },
     );
 
     // ─── Tool: memory_timeline ───
 
     api.registerTool(
-      {
+      (context) => ({
         name: "memory_timeline",
         label: "Memory Timeline",
         description:
@@ -906,7 +727,7 @@ const memosLocalPlugin = {
           chunkId: Type.String({ description: "The chunkId from a memory_search hit" }),
           window: Type.Optional(Type.Number({ description: "Context window ±N (default 2)" })),
         }),
-        execute: trackTool("memory_timeline", async (_toolCallId: any, params: any, context?: any) => {
+        execute: trackTool("memory_timeline", async (_toolCallId: any, params: any) => {
           const agentId = context?.agentId ?? currentAgentId;
           ctx.log.debug(`memory_timeline called (agent=${agentId})`);
           const { chunkId, window: win } = params as {
@@ -950,14 +771,14 @@ const memosLocalPlugin = {
             details: { entries, anchorRef: { sessionKey: anchorChunk.sessionKey, chunkId, turnId: anchorChunk.turnId, seq: anchorChunk.seq } },
           };
         }),
-      },
+      }),
       { name: "memory_timeline" },
     );
 
     // ─── Tool: memory_get ───
 
     api.registerTool(
-      {
+      (context) => ({
         name: "memory_get",
         label: "Memory Get",
         description:
@@ -968,7 +789,7 @@ const memosLocalPlugin = {
             Type.Number({ description: `Max chars (default ${DEFAULTS.getMaxCharsDefault}, max ${DEFAULTS.getMaxCharsMax})` }),
           ),
         }),
-        execute: trackTool("memory_get", async (_toolCallId: any, params: any, context?: any) => {
+        execute: trackTool("memory_get", async (_toolCallId: any, params: any) => {
           const { chunkId, maxChars } = params as { chunkId: string; maxChars?: number };
           const limit = Math.min(maxChars ?? DEFAULTS.getMaxCharsDefault, DEFAULTS.getMaxCharsMax);
 
@@ -994,7 +815,7 @@ const memosLocalPlugin = {
             },
           };
         }),
-      },
+      }),
       { name: "memory_get" },
     );
 
@@ -1335,6 +1156,10 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
             };
           }
 
+          const disabledWarning = skill.status === "archived"
+            ? "\n\n> **Warning:** This skill is currently **disabled** (archived). Its content is shown for reference only — it will not be used in search or auto-recall.\n\n"
+            : "";
+
           const manifest = skillInstaller.getCompanionManifest(resolvedSkillId);
           let footer = "\n\n---\n";
 
@@ -1359,7 +1184,7 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
           return {
             content: [{
               type: "text",
-              text: `## Skill: ${skill.name} (v${skill.version})\n\n${sv.content}${footer}`,
+              text: `## Skill: ${skill.name} (v${skill.version})${disabledWarning}\n\n${sv.content}${footer}`,
             }],
             details: {
               skillId: skill.id,
@@ -1516,7 +1341,7 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
     const viewerPort = (pluginCfg as any).viewerPort ?? (gatewayPort + 10);
 
     api.registerTool(
-      {
+      (context) => ({
         name: "memory_viewer",
         label: "Open Memory Viewer",
         description:
@@ -1524,10 +1349,11 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
           "or access their stored memories, or asks where the memory dashboard is. " +
           "Returns the URL the user can open in their browser.",
         parameters: Type.Object({}),
-        execute: trackTool("memory_viewer", async () => {
+        execute: trackTool("memory_viewer", async (_toolCallId: any, params: any) => {
           ctx.log.debug(`memory_viewer called`);
           telemetry.trackViewerOpened();
-          const url = `http://127.0.0.1:${viewerPort}`;
+          const agentId = context?.agentId ?? context?.profileId ?? currentAgentId;
+          const url = `http://127.0.0.1:${viewerPort}?agentId=${encodeURIComponent(agentId)}`;
           return {
             content: [
               {
@@ -1548,7 +1374,7 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
             details: { viewerUrl: url },
           };
         }),
-      },
+      }),
       { name: "memory_viewer" },
     );
 
@@ -1779,7 +1605,7 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
     // ─── Tool: skill_search ───
 
     api.registerTool(
-      {
+      (context) => ({
         name: "skill_search",
         label: "Skill Search",
         description:
@@ -1789,10 +1615,11 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
           query: Type.String({ description: "Natural language description of the needed skill" }),
           scope: Type.Optional(Type.String({ description: "Search scope: 'mix' (default), 'self', 'public', 'group', or 'all'." })),
         }),
-        execute: trackTool("skill_search", async (_toolCallId: any, params: any, context?: any) => {
+        execute: trackTool("skill_search", async (_toolCallId: any, params: any) => {
           const { query: skillQuery, scope: rawScope } = params as { query: string; scope?: string };
           const scope = (rawScope === "self" || rawScope === "public") ? rawScope : "mix";
-          const currentOwner = getCurrentOwner();
+          const agentId = context?.agentId ?? currentAgentId;
+          const currentOwner = `agent:${agentId}`;
 
           if (rawScope === "group" || rawScope === "all") {
             const [localHits, hub] = await Promise.all([
@@ -1854,7 +1681,7 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
             details: { query: skillQuery, scope, hits },
           };
         }),
-      },
+      }),
       { name: "skill_search" },
     );
 
@@ -1993,81 +1820,292 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
       { name: "network_skill_pull" },
     );
 
-    // ─── Skill auto-recall: inject relevant skills before agent starts ───
-    // Memory injection is handled by the Context Engine above.
-    // This hook only handles skill auto-recall via prependContext.
+    // ─── Auto-recall: inject relevant memories before agent starts ───
 
     api.on("before_prompt_build", async (event: { prompt?: string; messages?: unknown[] }, hookCtx?: { agentId?: string; sessionKey?: string }) => {
       if (!allowPromptInjection) return {};
       if (!event.prompt || event.prompt.length < 3) return;
 
-      const recallAgentId = hookCtx?.agentId ?? "main";
+      const recallAgentId = hookCtx?.agentId ?? (event as any)?.agentId ?? (event as any)?.profileId ?? "main";
       currentAgentId = recallAgentId;
-
-      const skillAutoRecall = ctx.config.skillEvolution?.autoRecallSkills ?? DEFAULTS.skillAutoRecall;
-      if (!skillAutoRecall) return;
+      const recallOwnerFilter = [`agent:${recallAgentId}`, "public"];
+      ctx.log.info(`auto-recall: agentId=${recallAgentId} (from hookCtx)`);
 
       const recallT0 = performance.now();
+      let recallQuery = "";
 
       try {
-        let query = event.prompt;
-        const senderTag = "Sender (untrusted metadata):";
-        const senderPos = query.indexOf(senderTag);
-        if (senderPos !== -1) {
-          const afterSender = query.slice(senderPos);
-          const fenceStart = afterSender.indexOf("```json");
-          const fenceEnd = fenceStart >= 0 ? afterSender.indexOf("```\n", fenceStart + 7) : -1;
-          if (fenceEnd > 0) {
-            query = afterSender.slice(fenceEnd + 4).replace(/^\s*\n/, "").trim();
+        const rawPrompt = event.prompt;
+        ctx.log.debug(`auto-recall: rawPrompt="${rawPrompt.slice(0, 300)}"`);
+
+        const query = normalizeAutoRecallQuery(rawPrompt);
+        recallQuery = query;
+
+        if (query.length < 2) {
+          ctx.log.debug("auto-recall: extracted query too short, skipping");
+          return;
+        }
+        ctx.log.debug(`auto-recall: query="${query.slice(0, 80)}"`);
+
+        // ── Phase 1: Local search ∥ Hub search (parallel) ──
+        const arLocalP = engine.search({ query, maxResults: 10, minScore: 0.45, ownerFilter: recallOwnerFilter });
+        const arHubP = ctx.config?.sharing?.enabled
+          ? hubSearchMemories(store, ctx, { query, maxResults: 10, scope: "all" })
+              .catch((err: any) => { ctx.log.debug(`auto-recall: hub search failed (${err})`); return { hits: [] as any[], meta: {} }; })
+          : Promise.resolve({ hits: [] as any[], meta: {} });
+
+        const [result, arHubResult] = await Promise.all([arLocalP, arHubP]);
+
+        const localHits = result.hits.filter((h) => h.origin !== "hub-memory");
+        const hubLocalHits = result.hits.filter((h) => h.origin === "hub-memory");
+        const hubRemoteHits: SearchHit[] = (arHubResult.hits ?? []).map((h: any) => ({
+          summary: h.summary,
+          original_excerpt: h.excerpt || h.summary,
+          ref: { sessionKey: "", chunkId: h.remoteHitId ?? "", turnId: "", seq: 0 },
+          score: 0.9,
+          taskId: null,
+          skillId: null,
+          origin: "hub-remote" as const,
+          source: { ts: h.source?.ts, role: h.source?.role ?? "assistant", sessionKey: "" },
+          ownerName: h.ownerName,
+          groupName: h.groupName,
+        }));
+        const allHubHits = [...hubLocalHits, ...hubRemoteHits];
+
+        ctx.log.debug(`auto-recall: local=${localHits.length}, hub-memory=${hubLocalHits.length}, hub-remote=${hubRemoteHits.length}`);
+
+        const rawLocalCandidates = localHits.map((h) => ({
+          score: h.score, role: h.source.role, summary: h.summary,
+          content: (h.original_excerpt ?? "").slice(0, 200), origin: h.origin || "local",
+          owner: h.owner || "",
+        }));
+        const rawHubCandidates = allHubHits.map((h) => ({
+          score: h.score, role: h.source.role, summary: h.summary,
+          content: (h.original_excerpt ?? "").slice(0, 200), origin: h.origin || "hub-remote",
+          ownerName: (h as any).ownerName ?? "", groupName: (h as any).groupName ?? "",
+        }));
+
+        const allRawHits = [...localHits, ...allHubHits];
+
+        if (allRawHits.length === 0) {
+          ctx.log.debug("auto-recall: no memory candidates found");
+          const dur = performance.now() - recallT0;
+          store.recordToolCall("memory_search", dur, true);
+          store.recordApiLog("memory_search", { type: "auto_recall", query }, JSON.stringify({
+            candidates: rawLocalCandidates, hubCandidates: rawHubCandidates, filtered: [],
+          }), dur, true);
+
+          const skillAutoRecallEarly = ctx.config.skillEvolution?.autoRecallSkills ?? DEFAULTS.skillAutoRecall;
+          if (skillAutoRecallEarly) {
+            try {
+              const skillLimit = ctx.config.skillEvolution?.autoRecallSkillLimit ?? DEFAULTS.skillAutoRecallLimit;
+              const skillHits = await engine.searchSkills(query, "mix" as any, getCurrentOwner());
+              const topSkills = skillHits.slice(0, skillLimit);
+              if (topSkills.length > 0) {
+                const skillLines = topSkills.map((sc, i) => {
+                  const manifest = skillInstaller.getCompanionManifest(sc.skillId);
+                  let badge = "";
+                  if (manifest?.installed) badge = " [installed]";
+                  else if (manifest?.installMode === "install_recommended") badge = " [has scripts, install recommended]";
+                  else if (manifest?.hasCompanionFiles) badge = " [has companion files]";
+                  return `${i + 1}. **${sc.name}**${badge} — ${sc.description.slice(0, 200)}\n   → call \`skill_get(skillId="${sc.skillId}")\` for the full guide`;
+                });
+                const skillContext = "## Relevant skills from past experience\n\n" +
+                  "No direct memory matches were found, but these skills from past tasks may help:\n\n" +
+                  skillLines.join("\n\n") +
+                  "\n\nYou SHOULD call `skill_get` to retrieve the full guide before attempting the task.";
+                ctx.log.info(`auto-recall-skill (no-memory path): injecting ${topSkills.length} skill(s)`);
+                try { store.recordApiLog("skill_search", { type: "auto_recall_skill", query }, JSON.stringify(topSkills), dur, true); } catch { /* best-effort */ }
+                return { prependContext: skillContext };
+              }
+            } catch (err) {
+              ctx.log.debug(`auto-recall-skill (no-memory path): failed: ${err}`);
+            }
+          }
+
+          if (query.length > 50) {
+            const noRecallHint =
+              "## Memory system — ACTION REQUIRED\n\n" +
+              "Auto-recall found no results for a long query. " +
+              "You MUST call `memory_search` now with a shortened query (2-5 key words) before answering. " +
+              "Do NOT skip this step. Do NOT answer without searching first.";
+            return { prependContext: noRecallHint };
+          }
+          return;
+        }
+
+        // ── Phase 2: Merge all → single LLM filter ──
+        const mergedForFilter = allRawHits.map((h, i) => ({
+          index: i + 1,
+          role: h.source.role,
+          content: (h.original_excerpt ?? "").slice(0, 300),
+          time: h.source.ts ? new Date(h.source.ts).toISOString().slice(0, 16) : "",
+        }));
+
+        let filteredHits = allRawHits;
+        let sufficient = false;
+
+        const filterResult = await summarizer.filterRelevant(query, mergedForFilter);
+        if (filterResult !== null) {
+          sufficient = filterResult.sufficient;
+          if (filterResult.relevant.length > 0) {
+            const indexSet = new Set(filterResult.relevant);
+            filteredHits = allRawHits.filter((_, i) => indexSet.has(i + 1));
           } else {
-            const firstDblNl = afterSender.indexOf("\n\n");
-            if (firstDblNl > 0) {
-              query = afterSender.slice(firstDblNl + 2).trim();
+            const dur = performance.now() - recallT0;
+            store.recordToolCall("memory_search", dur, true);
+            store.recordApiLog("memory_search", { type: "auto_recall", query }, JSON.stringify({
+              candidates: rawLocalCandidates, hubCandidates: rawHubCandidates, filtered: [],
+            }), dur, true);
+            if (query.length > 50) {
+              const noRecallHint =
+                "## Memory system — ACTION REQUIRED\n\n" +
+                "Auto-recall found no relevant results for a long query. " +
+                "You MUST call `memory_search` now with a shortened query (2-5 key words) before answering. " +
+                "Do NOT skip this step. Do NOT answer without searching first.";
+              return { prependContext: noRecallHint };
             }
+            return;
           }
         }
-        query = stripInboundMetadata(query).replace(/<[^>]+>/g, "").trim();
-        if (query.length < 2) return;
 
+        const beforeDedup = filteredHits.length;
+        filteredHits = deduplicateHits(filteredHits);
+        ctx.log.debug(`auto-recall: merged ${allRawHits.length} → ${beforeDedup} relevant → ${filteredHits.length} after dedup, sufficient=${sufficient}`);
+
+        const lines = filteredHits.map((h, i) => {
+          const excerpt = h.original_excerpt;
+          const oTag = h.origin === "local-shared" ? " [本机共享]" : h.origin === "hub-memory" ? " [团队缓存]" : "";
+          const parts: string[] = [`${i + 1}. [${h.source.role}]${oTag}`];
+          if (excerpt) parts.push(`   ${excerpt}`);
+          parts.push(`   chunkId="${h.ref.chunkId}"`);
+          if (h.taskId) {
+            const task = store.getTask(h.taskId);
+            if (task && task.status !== "skipped") {
+              parts.push(`   task_id="${h.taskId}"`);
+            }
+          }
+          return parts.join("\n");
+        });
+
+        const hasTask = filteredHits.some((h) => {
+          if (!h.taskId) return false;
+          const t = store.getTask(h.taskId);
+          return t && t.status !== "skipped";
+        });
+        const tips: string[] = [];
+        if (hasTask) {
+          tips.push("- A hit has `task_id` → call `task_summary(taskId=\"...\")` to get the full task context (steps, code, results)");
+          tips.push("- A task may have a reusable guide → call `skill_get(taskId=\"...\")` to retrieve the experience/skill");
+        }
+        tips.push("- Need more surrounding dialogue → call `memory_timeline(chunkId=\"...\")` to expand context around a hit");
+        const tipsText = "\n\nAvailable follow-up tools:\n" + tips.join("\n");
+
+        const contextParts = [
+          "## User's conversation history (from memory system)",
+          "",
+          "IMPORTANT: The following are facts from previous conversations with this user.",
+          "You MUST treat these as established knowledge and use them directly when answering.",
+          "Do NOT say you don't know or don't have information if the answer is in these memories.",
+          "",
+          lines.join("\n\n"),
+        ];
+        if (tipsText) contextParts.push(tipsText);
+
+        // ─── Skill auto-recall ───
+        const skillAutoRecall = ctx.config.skillEvolution?.autoRecallSkills ?? DEFAULTS.skillAutoRecall;
         const skillLimit = ctx.config.skillEvolution?.autoRecallSkillLimit ?? DEFAULTS.skillAutoRecallLimit;
-        const skillCandidateMap = new Map<string, { name: string; description: string; skillId: string; source: string }>();
+        let skillSection = "";
 
-        try {
-          const directSkillHits = await engine.searchSkills(query, "mix" as any, getCurrentOwner());
-          for (const sh of directSkillHits.slice(0, skillLimit + 2)) {
-            if (!skillCandidateMap.has(sh.skillId)) {
-              skillCandidateMap.set(sh.skillId, { name: sh.name, description: sh.description, skillId: sh.skillId, source: "query" });
+        if (skillAutoRecall) {
+          try {
+            const skillCandidateMap = new Map<string, { name: string; description: string; skillId: string; source: string }>();
+
+            try {
+              const directSkillHits = await engine.searchSkills(query, "mix" as any, getCurrentOwner());
+              for (const sh of directSkillHits.slice(0, skillLimit + 2)) {
+                if (!skillCandidateMap.has(sh.skillId)) {
+                  skillCandidateMap.set(sh.skillId, { name: sh.name, description: sh.description, skillId: sh.skillId, source: "query" });
+                }
+              }
+            } catch (err) {
+              ctx.log.debug(`auto-recall-skill: direct search failed: ${err}`);
+            }
+
+            const taskIds = new Set<string>();
+            for (const h of filteredHits) {
+              if (h.taskId) {
+                const t = store.getTask(h.taskId);
+                if (t && t.status !== "skipped") taskIds.add(h.taskId);
+              }
+            }
+            for (const tid of taskIds) {
+              const linked = store.getSkillsByTask(tid);
+              for (const rs of linked) {
+                if (!skillCandidateMap.has(rs.skill.id)) {
+                  skillCandidateMap.set(rs.skill.id, { name: rs.skill.name, description: rs.skill.description, skillId: rs.skill.id, source: `task:${tid}` });
+                }
+              }
+            }
+
+            const skillCandidates = [...skillCandidateMap.values()].slice(0, skillLimit);
+
+            if (skillCandidates.length > 0) {
+              const skillLines = skillCandidates.map((sc, i) => {
+                const manifest = skillInstaller.getCompanionManifest(sc.skillId);
+                let badge = "";
+                if (manifest?.installed) badge = " [installed]";
+                else if (manifest?.installMode === "install_recommended") badge = " [has scripts, install recommended]";
+                else if (manifest?.hasCompanionFiles) badge = " [has companion files]";
+                const action = `call \`skill_get(skillId="${sc.skillId}")\``;
+                return `${i + 1}. **${sc.name}**${badge} — ${sc.description.slice(0, 200)}\n   → ${action}`;
+              });
+              skillSection = "\n\n## Relevant skills from past experience\n\n" +
+                "The following skills were distilled from similar previous tasks. " +
+                "You SHOULD call `skill_get` to retrieve the full guide before attempting the task.\n\n" +
+                skillLines.join("\n\n");
+
+              ctx.log.info(`auto-recall-skill: injecting ${skillCandidates.length} skill(s): ${skillCandidates.map(s => s.name).join(", ")}`);
+              try {
+                store.recordApiLog("skill_search", { type: "auto_recall_skill", query }, JSON.stringify(skillCandidates), performance.now() - recallT0, true);
+              } catch { /* best-effort */ }
+            } else {
+              ctx.log.debug("auto-recall-skill: no matching skills found");
             }
+          } catch (err) {
+            ctx.log.debug(`auto-recall-skill: failed: ${err}`);
           }
-        } catch (err) {
-          ctx.log.debug(`auto-recall-skill: direct search failed: ${err}`);
         }
 
-        const skillCandidates = [...skillCandidateMap.values()].slice(0, skillLimit);
-        if (skillCandidates.length === 0) return;
-
-        const skillLines = skillCandidates.map((sc, i) => {
-          const manifest = skillInstaller.getCompanionManifest(sc.skillId);
-          let badge = "";
-          if (manifest?.installed) badge = " [installed]";
-          else if (manifest?.installMode === "install_recommended") badge = " [has scripts, install recommended]";
-          else if (manifest?.hasCompanionFiles) badge = " [has companion files]";
-          const action = `call \`skill_get(skillId="${sc.skillId}")\``;
-          return `${i + 1}. **${sc.name}**${badge} — ${sc.description.slice(0, 200)}\n   → ${action}`;
-        });
-        const skillContext = "## Relevant skills from past experience\n\n" +
-          "The following skills were distilled from similar previous tasks. " +
-          "You SHOULD call `skill_get` to retrieve the full guide before attempting the task.\n\n" +
-          skillLines.join("\n\n");
-
-        ctx.log.info(`auto-recall-skill: injecting ${skillCandidates.length} skill(s): ${skillCandidates.map(s => s.name).join(", ")}`);
-        try {
-          store.recordApiLog("skill_search", { type: "auto_recall_skill", query }, JSON.stringify(skillCandidates), performance.now() - recallT0, true);
-        } catch { /* best-effort */ }
+        if (skillSection) contextParts.push(skillSection);
+        const context = contextParts.join("\n");
+
+        const recallDur = performance.now() - recallT0;
+        store.recordToolCall("memory_search", recallDur, true);
+        store.recordApiLog("memory_search", { type: "auto_recall", query }, JSON.stringify({
+          candidates: rawLocalCandidates,
+          hubCandidates: rawHubCandidates,
+          filtered: filteredHits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt, origin: h.origin || "local", owner: h.owner || "" })),
+        }), recallDur, true);
+        telemetry.trackAutoRecall(filteredHits.length, recallDur);
+
+        ctx.log.info(`auto-recall: returning prependContext (${context.length} chars), sufficient=${sufficient}, skills=${skillSection ? "yes" : "no"}`);
+
+        if (!sufficient) {
+          const searchHint =
+            "\n\nIf these memories don't fully answer the question, " +
+            "call `memory_search` with a shorter or rephrased query to find more.";
+          return { prependContext: context + searchHint };
+        }
 
-        return { prependContext: skillContext };
+        return {
+          prependContext: context,
+        };
       } catch (err) {
-        ctx.log.warn(`auto-recall-skill failed: ${String(err)}`);
+        const dur = performance.now() - recallT0;
+        store.recordToolCall("memory_search", dur, false);
+        try { store.recordApiLog("memory_search", { type: "auto_recall", query: recallQuery }, `error: ${String(err)}`, dur, false); } catch (_) { /* best-effort */ }
+        ctx.log.warn(`auto-recall failed: ${String(err)}`);
       }
     });
 
@@ -2083,7 +2121,7 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
       if (!event.success || !event.messages || event.messages.length === 0) return;
 
       try {
-        const captureAgentId = hookCtx?.agentId ?? "main";
+        const captureAgentId = hookCtx?.agentId ?? event?.agentId ?? event?.profileId ?? "main";
         currentAgentId = captureAgentId;
         const captureOwner = `agent:${captureAgentId}`;
         const sessionKey = hookCtx?.sessionKey ?? "default";
@@ -2301,48 +2339,54 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
 
     // ─── Service lifecycle ───
 
-    api.registerService({
-      id: "memos-local-openclaw-plugin",
-      start: async () => {
-        if (hubServer) {
-          const hubUrl = await hubServer.start();
-          api.logger.info(`memos-local: hub started at ${hubUrl}`);
-        }
+    let serviceStarted = false;
 
-        // Auto-connect to Hub in client mode (handles both existing token and auto-join via teamToken)
-        if (ctx.config.sharing?.enabled && ctx.config.sharing.role === "client") {
-          try {
-            const session = await connectToHub(store, ctx.config, ctx.log);
-            api.logger.info(`memos-local: connected to Hub as "${session.username}" (${session.userId})`);
-          } catch (err) {
-            api.logger.warn(`memos-local: Hub connection failed: ${err}`);
-          }
-        }
+    const startServiceCore = async () => {
+      if (serviceStarted) return;
+      serviceStarted = true;
 
+      if (hubServer) {
+        const hubUrl = await hubServer.start();
+        api.logger.info(`memos-local: hub started at ${hubUrl}`);
+      }
+
+      if (ctx.config.sharing?.enabled && ctx.config.sharing.role === "client") {
         try {
-          const viewerUrl = await viewer.start();
-          api.logger.info(`memos-local: started (embedding: ${embedder.provider})`);
-          api.logger.info(`╔══════════════════════════════════════════╗`);
-          api.logger.info(`║  MemOS Memory Viewer                     ║`);
-          api.logger.info(`║  → ${viewerUrl.padEnd(37)}║`);
-          api.logger.info(`║  Open in browser to manage memories       ║`);
-          api.logger.info(`╚══════════════════════════════════════════╝`);
-          api.logger.info(`memos-local: password reset token: ${viewer.getResetToken()}`);
-          api.logger.info(`memos-local: forgot password? Use the reset token on the login page.`);
-          skillEvolver.recoverOrphanedTasks().then((count) => {
-            if (count > 0) api.logger.info(`memos-local: recovered ${count} orphaned skill tasks`);
-          }).catch((err) => {
-            api.logger.warn(`memos-local: skill recovery failed: ${err}`);
-          });
+          const session = await connectToHub(store, ctx.config, ctx.log);
+          api.logger.info(`memos-local: connected to Hub as "${session.username}" (${session.userId})`);
         } catch (err) {
-          api.logger.warn(`memos-local: viewer failed to start: ${err}`);
-          api.logger.info(`memos-local: started (embedding: ${embedder.provider})`);
+          api.logger.warn(`memos-local: Hub connection failed: ${err}`);
         }
-        telemetry.trackPluginStarted(
-          ctx.config.embedding?.provider ?? "local",
-          ctx.config.summarizer?.provider ?? "none",
-        );
-      },
+      }
+
+      try {
+        const viewerUrl = await viewer.start();
+        api.logger.info(`memos-local: started (embedding: ${embedder.provider})`);
+        api.logger.info(`╔══════════════════════════════════════════╗`);
+        api.logger.info(`║  MemOS Memory Viewer                     ║`);
+        api.logger.info(`║  → ${viewerUrl.padEnd(37)}║`);
+        api.logger.info(`║  Open in browser to manage memories       ║`);
+        api.logger.info(`╚══════════════════════════════════════════╝`);
+        api.logger.info(`memos-local: password reset token: ${viewer.getResetToken()}`);
+        api.logger.info(`memos-local: forgot password? Use the reset token on the login page.`);
+        skillEvolver.recoverOrphanedTasks().then((count) => {
+          if (count > 0) api.logger.info(`memos-local: recovered ${count} orphaned skill tasks`);
+        }).catch((err) => {
+          api.logger.warn(`memos-local: skill recovery failed: ${err}`);
+        });
+      } catch (err) {
+        api.logger.warn(`memos-local: viewer failed to start: ${err}`);
+        api.logger.info(`memos-local: started (embedding: ${embedder.provider})`);
+      }
+      telemetry.trackPluginStarted(
+        ctx.config.embedding?.provider ?? "local",
+        ctx.config.summarizer?.provider ?? "none",
+      );
+    };
+
+    api.registerService({
+      id: "memos-local-openclaw-plugin",
+      start: async () => { await startServiceCore(); },
       stop: async () => {
         await worker.flush();
         await telemetry.shutdown();
@@ -2352,6 +2396,19 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
         api.logger.info("memos-local: stopped");
       },
     });
+
+    // Fallback: OpenClaw may load this plugin via deferred reload after
+    // startPluginServices has already run, so service.start() never fires.
+    // Self-start the viewer after a grace period if it hasn't been started.
+    const SELF_START_DELAY_MS = 3000;
+    setTimeout(() => {
+      if (!serviceStarted) {
+        api.logger.info("memos-local: service.start() not called by host, self-starting viewer...");
+        startServiceCore().catch((err) => {
+          api.logger.warn(`memos-local: self-start failed: ${err}`);
+        });
+      }
+    }, SELF_START_DELAY_MS);
   },
 };
 
diff --git a/apps/memos-local-openclaw/install.ps1 b/apps/memos-local-openclaw/install.ps1
index bd42aa5e9..14e70fd93 100644
--- a/apps/memos-local-openclaw/install.ps1
+++ b/apps/memos-local-openclaw/install.ps1
@@ -192,6 +192,9 @@ if (!config.plugins.allow.includes(pluginId)) {
 // Clean up stale contextEngine slot from previous versions
 if (config.plugins.slots && config.plugins.slots.contextEngine) {
   delete config.plugins.slots.contextEngine;
+  if (Object.keys(config.plugins.slots).length === 0) {
+    delete config.plugins.slots;
+  }
 }
 
 // Register plugin in memory slot
@@ -209,25 +212,27 @@ if (!config.plugins.entries[pluginId] || typeof config.plugins.entries[pluginId]
 }
 config.plugins.entries[pluginId].enabled = true;
 
-// Register plugin in installs so gateway auto-loads it on restart
+// Register plugin in installs so gateway auto-loads it on restart (pinned spec when package.json exists)
 if (!config.plugins.installs || typeof config.plugins.installs !== "object") {
   config.plugins.installs = {};
 }
+let resolvedName = "";
+let resolvedVersion = "";
 const pkgJsonPath = path.join(installPath, "package.json");
-let resolvedName, resolvedVersion;
 if (fs.existsSync(pkgJsonPath)) {
   const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
   resolvedName = pkg.name;
   resolvedVersion = pkg.version;
 }
+const pinnedSpec = resolvedName && resolvedVersion ? `${resolvedName}@${resolvedVersion}` : spec;
 config.plugins.installs[pluginId] = {
   source: "npm",
-  spec,
+  spec: pinnedSpec,
   installPath,
   ...(resolvedVersion ? { version: resolvedVersion } : {}),
   ...(resolvedName ? { resolvedName } : {}),
   ...(resolvedVersion ? { resolvedVersion } : {}),
-  ...(resolvedName && resolvedVersion ? { resolvedSpec: `${resolvedName}@${resolvedVersion}` } : {}),
+  ...(resolvedName && resolvedVersion ? { resolvedSpec: pinnedSpec } : {}),
   installedAt: new Date().toISOString(),
 };
 
@@ -359,6 +364,38 @@ if (-not (Test-Path $ExtensionDir)) {
   exit 1
 }
 
+$NodeModulesDir = Join-Path $ExtensionDir "node_modules"
+if (-not (Test-Path $NodeModulesDir)) {
+  Write-Warn "node_modules missing after install (postinstall may have cleaned it). Reinstalling..."
+  Push-Location $ExtensionDir
+  try {
+    & npm install --omit=dev --no-fund --no-audit --ignore-scripts --loglevel=error 2>&1
+  }
+  finally {
+    Pop-Location
+  }
+}
+
+$SqliteDir = Join-Path $ExtensionDir "node_modules\better-sqlite3"
+if (-not (Test-Path $SqliteDir)) {
+  Write-Warn "better-sqlite3 missing, attempting rebuild..."
+  Push-Location $ExtensionDir
+  try {
+    & npm rebuild better-sqlite3 2>&1
+  }
+  catch {
+    Write-Warn "better-sqlite3 rebuild returned an error. Continuing..."
+  }
+  finally {
+    Pop-Location
+  }
+}
+
+if (-not (Test-Path $NodeModulesDir)) {
+  Write-Err "Dependencies installation failed. Run manually: cd $ExtensionDir && npm install --omit=dev"
+  exit 1
+}
+
 Update-OpenClawConfig -OpenClawHome $OpenClawHome -ConfigPath $OpenClawConfigPath -PluginId $PluginId -InstallPath $ExtensionDir -Spec $PackageSpec
 
 Write-Info "Installing OpenClaw Gateway service..."
@@ -368,9 +405,18 @@ if (-not $?) { Write-Warn "Gateway service install returned a warning; continuin
 Write-Success "Starting OpenClaw Gateway service..."
 & npx openclaw gateway start 2>&1
 
+Write-Info "Starting Memory Viewer, 正在启动记忆面板..."
+for ($i = 1; $i -le 5; $i++) {
+  $listening = Get-NetTCPConnection -LocalPort 18799 -State Listen -ErrorAction SilentlyContinue
+  if ($listening) { break }
+  Write-Host "." -NoNewline
+  Start-Sleep -Seconds 1
+}
+Write-Host ""
+
 Write-Host ""
 Write-Success "=========================================="
-Write-Success "  Installation complete!"
+Write-Success "  Installation complete! 安装完成!"
 Write-Success "=========================================="
 Write-Host ""
 Write-Info "  OpenClaw Web UI:      http://localhost:$Port"
diff --git a/apps/memos-local-openclaw/install.sh b/apps/memos-local-openclaw/install.sh
index 31e8a1982..fc1585db4 100644
--- a/apps/memos-local-openclaw/install.sh
+++ b/apps/memos-local-openclaw/install.sh
@@ -252,6 +252,9 @@ if (!config.plugins.allow.includes(pluginId)) {
 // Clean up stale contextEngine slot from previous versions
 if (config.plugins.slots && config.plugins.slots.contextEngine) {
   delete config.plugins.slots.contextEngine;
+  if (Object.keys(config.plugins.slots).length === 0) {
+    delete config.plugins.slots;
+  }
 }
 
 // Register plugin in memory slot
@@ -269,25 +272,27 @@ if (!config.plugins.entries[pluginId] || typeof config.plugins.entries[pluginId]
 }
 config.plugins.entries[pluginId].enabled = true;
 
-// Register plugin in installs so gateway auto-loads it on restart
+// Register plugin in installs so gateway auto-loads it on restart (pinned spec when package.json exists)
 if (!config.plugins.installs || typeof config.plugins.installs !== 'object') {
   config.plugins.installs = {};
 }
+let resolvedName = '';
+let resolvedVersion = '';
 const pkgJsonPath = path.join(installPath, 'package.json');
-let resolvedName, resolvedVersion;
 if (fs.existsSync(pkgJsonPath)) {
   const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
   resolvedName = pkg.name;
   resolvedVersion = pkg.version;
 }
+const pinnedSpec = resolvedName && resolvedVersion ? `${resolvedName}@${resolvedVersion}` : spec;
 config.plugins.installs[pluginId] = {
   source: 'npm',
-  spec,
+  spec: pinnedSpec,
   installPath,
   ...(resolvedVersion ? { version: resolvedVersion } : {}),
   ...(resolvedName ? { resolvedName } : {}),
   ...(resolvedVersion ? { resolvedVersion } : {}),
-  ...(resolvedName && resolvedVersion ? { resolvedSpec: `${resolvedName}@${resolvedVersion}` } : {}),
+  ...(resolvedName && resolvedVersion ? { resolvedSpec: pinnedSpec } : {}),
   installedAt: new Date().toISOString(),
 };
 
@@ -358,6 +363,28 @@ if [[ ! -d "$EXTENSION_DIR" ]]; then
   exit 1
 fi
 
+if [[ ! -d "${EXTENSION_DIR}/node_modules" ]]; then
+  warn "node_modules missing after install (postinstall may have cleaned it), 安装后 node_modules 缺失，正在重新安装..."
+  (
+    cd "${EXTENSION_DIR}"
+    npm install --omit=dev --no-fund --no-audit --ignore-scripts --loglevel=error 2>&1
+  )
+fi
+
+if [[ ! -d "${EXTENSION_DIR}/node_modules/better-sqlite3" ]]; then
+  warn "better-sqlite3 missing, attempting rebuild, better-sqlite3 缺失，尝试重新编译..."
+  (
+    cd "${EXTENSION_DIR}"
+    npm rebuild better-sqlite3 2>&1 || true
+  )
+fi
+
+if [[ ! -d "${EXTENSION_DIR}/node_modules" ]]; then
+  error "Dependencies installation failed. Run manually: cd ${EXTENSION_DIR} && npm install --omit=dev"
+  error "依赖安装失败，请手动运行: cd ${EXTENSION_DIR} && npm install --omit=dev"
+  exit 1
+fi
+
 update_openclaw_config
 
 info "Install OpenClaw Gateway service, 安装 OpenClaw Gateway 服务..."
@@ -366,6 +393,16 @@ npx openclaw gateway install --port "${PORT}" --force 2>&1 || true
 success "Start OpenClaw Gateway service, 启动 OpenClaw Gateway 服务..."
 npx openclaw gateway start 2>&1
 
+info "Starting Memory Viewer, 正在启动记忆面板..."
+for i in 1 2 3 4 5; do
+  if command -v lsof >/dev/null 2>&1 && lsof -i :18799 -t >/dev/null 2>&1; then
+    break
+  fi
+  printf "."
+  sleep 1
+done
+echo ""
+
 echo ""
 success "=========================================="
 success "  Installation complete! 安装完成!"
diff --git a/apps/memos-local-openclaw/openclaw.plugin.json b/apps/memos-local-openclaw/openclaw.plugin.json
index dfef6740f..bb828c19f 100644
--- a/apps/memos-local-openclaw/openclaw.plugin.json
+++ b/apps/memos-local-openclaw/openclaw.plugin.json
@@ -3,7 +3,7 @@
   "name": "MemOS Local Memory",
   "description": "Full-write local conversation memory with hybrid search (RRF + MMR + recency), task summarization, skill evolution, and team sharing (Hub-Client). Provides memory_search, memory_get, task_summary, skill_search, task_share, network_skill_pull, network_team_info, memory_viewer for layered retrieval and team collaboration.",
   "kind": "memory",
-  "version": "1.0.6-beta.11",
+  "version": "1.0.8",
   "skills": [
     "skill/memos-memory-guide"
   ],
diff --git a/apps/memos-local-openclaw/package.json b/apps/memos-local-openclaw/package.json
index cd450d472..a5f3b4817 100644
--- a/apps/memos-local-openclaw/package.json
+++ b/apps/memos-local-openclaw/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@memtensor/memos-local-openclaw-plugin",
-  "version": "1.0.7-beta.1",
+  "version": "1.0.8",
   "description": "MemOS Local memory plugin for OpenClaw — full-write, hybrid-recall, progressive retrieval",
   "type": "module",
   "main": "index.ts",
@@ -45,12 +45,13 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=22.0.0"
+    "node": ">=18.0.0 <25.0.0"
   },
   "dependencies": {
     "@huggingface/transformers": "^3.8.0",
     "@sinclair/typebox": "^0.34.48",
-    "better-sqlite3": "^12.6.2",
+    "better-sqlite3": "^12.6.3",
+    "posthog-node": "^5.28.0",
     "puppeteer": "^24.38.0",
     "semver": "^7.7.4",
     "uuid": "^10.0.0"
diff --git a/apps/memos-local-openclaw/scripts/postinstall.cjs b/apps/memos-local-openclaw/scripts/postinstall.cjs
index 96e073bce..f437c1c20 100644
--- a/apps/memos-local-openclaw/scripts/postinstall.cjs
+++ b/apps/memos-local-openclaw/scripts/postinstall.cjs
@@ -30,6 +30,9 @@ function normalizePathForMatch(p) {
   return path.resolve(p).replace(/^\\\\\?\\/, "").replace(/\\/g, "/").toLowerCase();
 }
 
+const nodeVersion = process.version;
+const nodeMajor = parseInt(nodeVersion.slice(1).split('.')[0], 10);
+
 console.log(`
 ${CYAN}${BOLD}┌──────────────────────────────────────────────────┐
 │  MemOS Local Memory — postinstall setup          │
@@ -37,7 +40,13 @@ ${CYAN}${BOLD}┌─────────────────────
 `);
 
 log(`Plugin dir: ${DIM}${pluginDir}${RESET}`);
-log(`Node: ${process.version}  Platform: ${process.platform}-${process.arch}`);
+log(`Node: ${GREEN}${nodeVersion}${RESET}  Platform: ${process.platform}-${process.arch}`);
+
+if (nodeMajor >= 25) {
+  warn(`Node.js ${nodeVersion} detected. This version may have compatibility issues with native modules.`);
+  log(`Recommended: Use Node.js LTS (v20 or v22) for best compatibility.`);
+  log(`You can use nvm to switch versions: ${CYAN}nvm use 22${RESET}`);
+}
 
 /* ═══════════════════════════════════════════════════════════
  *  Pre-phase: Clean stale build artifacts on upgrade
@@ -61,21 +70,30 @@ function cleanStaleArtifacts() {
     installedVer = pkg.version || "unknown";
   } catch { /* ignore */ }
 
+  const nodeMajor = process.versions.node.split(".")[0];
+  const currentFingerprint = `${installedVer}+node${nodeMajor}`;
+
   const markerPath = path.join(pluginDir, ".installed-version");
-  let prevVer = "";
-  try { prevVer = fs.readFileSync(markerPath, "utf-8").trim(); } catch { /* first install */ }
+  let prevFingerprint = "";
+  try { prevFingerprint = fs.readFileSync(markerPath, "utf-8").trim(); } catch { /* first install */ }
+
+  const writeMarker = () => {
+    try { fs.writeFileSync(markerPath, currentFingerprint + "\n", "utf-8"); } catch { /* ignore */ }
+  };
 
-  if (prevVer === installedVer) {
-    log(`Version unchanged (${installedVer}), skipping artifact cleanup.`);
+  if (prevFingerprint === currentFingerprint) {
+    log(`Version unchanged (${currentFingerprint}), skipping artifact cleanup.`);
     return;
   }
 
-  if (prevVer) {
-    log(`Upgrade detected: ${DIM}${prevVer}${RESET} → ${GREEN}${installedVer}${RESET}`);
-  } else {
-    log(`Fresh install: ${GREEN}${installedVer}${RESET}`);
+  if (!prevFingerprint) {
+    log(`Fresh install: ${GREEN}${currentFingerprint}${RESET}`);
+    writeMarker();
+    return;
   }
 
+  log(`Environment changed: ${DIM}${prevFingerprint}${RESET} → ${GREEN}${currentFingerprint}${RESET}`);
+
   const dirsToClean = ["dist", "node_modules"];
   let cleaned = 0;
   for (const dir of dirsToClean) {
@@ -99,7 +117,7 @@ function cleanStaleArtifacts() {
     }
   }
 
-  try { fs.writeFileSync(markerPath, installedVer + "\n", "utf-8"); } catch { /* ignore */ }
+  writeMarker();
 
   if (cleaned > 0) {
     ok(`Cleaned ${cleaned} stale artifact(s). Fresh install will follow.`);
@@ -418,23 +436,39 @@ if (sqliteBindingsExist()) {
     else { fail(`Rebuild completed but bindings still missing (${elapsed}s).`); fail(`Looked in: ${sqliteModulePath}/build/`); }
     console.log(`
 ${YELLOW}${BOLD}  ╔══════════════════════════════════════════════════════════════╗
-  ║  ✖ better-sqlite3 native module build failed               ║
+  ║  ✖ better-sqlite3 native module build failed                 ║
   ╠══════════════════════════════════════════════════════════════╣${RESET}
-${YELLOW}  ║${RESET}                                                             ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}  This plugin requires C/C++ build tools to compile         ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}  the SQLite native module on first install.                ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}                                                             ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}  ${BOLD}Install build tools:${RESET}                                      ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}                                                             ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}  ${CYAN}macOS:${RESET}   xcode-select --install                          ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}  ${CYAN}Ubuntu:${RESET}  sudo apt install build-essential python3        ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}  ${CYAN}Windows:${RESET} npm install -g windows-build-tools              ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}                                                             ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}  ${BOLD}Then retry:${RESET}                                                ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  This plugin requires C/C++ build tools to compile           ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  the SQLite native module on first install.                  ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  ${BOLD}Install build tools:${RESET}                                       ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  ${CYAN}macOS:${RESET}   xcode-select --install                           ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  ${CYAN}Ubuntu:${RESET}  sudo apt install build-essential python3         ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  ${CYAN}Windows:${RESET} npm install -g windows-build-tools               ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}`);
+
+if (nodeMajor >= 25) {
+  console.log(`${YELLOW}  ║${RESET}  ${BOLD}${RED}Node.js v25+ compatibility issue detected:${RESET}                ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  better-sqlite3 may not have prebuilt binaries for Node 25.   ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  ${BOLD}Recommended solutions:${RESET}                                     ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  1. Use Node.js LTS (v20 or v22):                             ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}     ${GREEN}nvm install 22 && nvm use 22${RESET}                            ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  2. Or use MemOS Cloud version instead:                       ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}     ${CYAN}https://github.com/MemTensor/MemOS/tree/main/apps/memos-cloud${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}`);
+}
+
+console.log(`${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  ${BOLD}Then retry:${RESET}                                                 ${YELLOW}║${RESET}
 ${YELLOW}  ║${RESET}  ${GREEN}cd ${pluginDir}${RESET}
-${YELLOW}  ║${RESET}  ${GREEN}npm rebuild better-sqlite3${RESET}                                ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}  ${GREEN}openclaw gateway stop && openclaw gateway start${RESET}           ${YELLOW}║${RESET}
-${YELLOW}  ║${RESET}                                                             ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  ${GREEN}npm rebuild better-sqlite3${RESET}                                 ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}  ${GREEN}openclaw gateway stop && openclaw gateway start${RESET}            ${YELLOW}║${RESET}
+${YELLOW}  ║${RESET}                                                              ${YELLOW}║${RESET}
 ${YELLOW}${BOLD}  ╚══════════════════════════════════════════════════════════════╝${RESET}
 `);
   }
diff --git a/apps/memos-local-openclaw/src/client/hub.ts b/apps/memos-local-openclaw/src/client/hub.ts
index 1a1ebd1bb..fce122fd5 100644
--- a/apps/memos-local-openclaw/src/client/hub.ts
+++ b/apps/memos-local-openclaw/src/client/hub.ts
@@ -177,6 +177,8 @@ function getClientIp(): string {
   return "";
 }
 
+const HUB_FETCH_TIMEOUT_MS = 25_000;
+
 export async function hubRequestJson(
   hubUrl: string,
   userToken: string,
@@ -184,8 +186,17 @@ export async function hubRequestJson(
   init: RequestInit = {},
 ): Promise<unknown> {
   const clientIp = getClientIp();
+  const timeoutSignal =
+    typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function"
+      ? AbortSignal.timeout(HUB_FETCH_TIMEOUT_MS)
+      : undefined;
+  const mergedSignal =
+    timeoutSignal && init.signal
+      ? AbortSignal.any([timeoutSignal, init.signal])
+      : (timeoutSignal ?? init.signal);
   const res = await fetch(`${normalizeHubUrl(hubUrl)}${route}`, {
     ...init,
+    ...(mergedSignal ? { signal: mergedSignal } : {}),
     headers: {
       authorization: `Bearer ${userToken}`,
       ...(clientIp ? { "x-client-ip": clientIp } : {}),
diff --git a/apps/memos-local-openclaw/src/context-engine/index.ts b/apps/memos-local-openclaw/src/context-engine/index.ts
deleted file mode 100644
index 5b32f672c..000000000
--- a/apps/memos-local-openclaw/src/context-engine/index.ts
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- * MemOS Local Memory — Context Engine
- *
- * Injects recalled memories into assistant messages wrapped in <relevant-memories>
- * tags. OpenClaw's UI automatically strips these tags from assistant messages,
- * keeping the chat clean while providing full context to the LLM.
- *
- * Memory blocks are persisted into the session file so the prompt prefix remains
- * stable across turns, maximizing KV cache reuse.
- */
-
-// ---------------------------------------------------------------------------
-// Types
-// ---------------------------------------------------------------------------
-
-/** Minimal AgentMessage shape used by OpenClaw */
-export interface AgentMessage {
-  role: string;
-  content: string | ContentBlock[];
-  timestamp?: number;
-  [key: string]: unknown;
-}
-
-export interface ContentBlock {
-  type: string;
-  text?: string;
-  [key: string]: unknown;
-}
-
-export interface SearchHit {
-  score: number;
-  summary: string;
-  original_excerpt?: string;
-  source: { role: string; ts?: number; sessionKey?: string };
-  ref: { chunkId: string; sessionKey?: string; turnId?: string; seq?: number };
-  taskId?: string | null;
-  skillId?: string | null;
-  origin?: string;
-  ownerName?: string;
-  groupName?: string;
-}
-
-export interface RecallSearchResult {
-  hits: SearchHit[];
-}
-
-export interface RecallEngineLike {
-  search(params: {
-    query: string;
-    maxResults: number;
-    minScore: number;
-    ownerFilter?: string[];
-  }): Promise<RecallSearchResult>;
-}
-
-export interface PendingInjection {
-  sessionKey: string;
-  memoryBlock: string;
-  isSynthetic: boolean;
-}
-
-export interface ContextEngineLogger {
-  info(msg: string): void;
-  warn(msg: string): void;
-  debug(msg: string): void;
-}
-
-// ---------------------------------------------------------------------------
-// Message helpers
-// ---------------------------------------------------------------------------
-
-export function getTextFromMessage(msg: AgentMessage): string {
-  if (typeof msg.content === "string") return msg.content;
-  if (Array.isArray(msg.content)) {
-    return msg.content
-      .filter((b) => b.type === "text" && typeof b.text === "string")
-      .map((b) => b.text!)
-      .join("");
-  }
-  return "";
-}
-
-export function appendMemoryToMessage(msg: AgentMessage, memoryBlock: string): void {
-  if (typeof msg.content === "string") {
-    msg.content = msg.content + memoryBlock;
-    return;
-  }
-  if (Array.isArray(msg.content)) {
-    const lastText = [...msg.content].reverse().find((b) => b.type === "text");
-    if (lastText && typeof lastText.text === "string") {
-      lastText.text += memoryBlock;
-    } else {
-      msg.content.push({ type: "text", text: memoryBlock });
-    }
-    return;
-  }
-  msg.content = memoryBlock;
-}
-
-const MEMORY_TAG_RE = /\n?<relevant-memories>[\s\S]*?<\/relevant-memories>/g;
-
-export function removeExistingMemoryBlock(msg: AgentMessage): void {
-  if (typeof msg.content === "string") {
-    msg.content = msg.content.replace(MEMORY_TAG_RE, "");
-    return;
-  }
-  if (Array.isArray(msg.content)) {
-    for (const block of msg.content) {
-      if (block.type === "text" && typeof block.text === "string") {
-        block.text = block.text.replace(MEMORY_TAG_RE, "");
-      }
-    }
-  }
-}
-
-export function messageHasMemoryBlock(msg: AgentMessage): boolean {
-  return getTextFromMessage(msg).includes("<relevant-memories>");
-}
-
-// ---------------------------------------------------------------------------
-// Memory block formatting
-// ---------------------------------------------------------------------------
-
-export function formatMemoryBlock(hits: SearchHit[]): string {
-  const lines = hits
-    .map(
-      (h, i) =>
-        `${i + 1}. [${h.source.role}] ${(h.original_excerpt ?? h.summary).slice(0, 200)}`,
-    )
-    .join("\n");
-  return (
-    `\n<relevant-memories>\n` +
-    `[Memory context relevant to the next user message — injected by user's memory system, not part of assistant's original reply]\n\n` +
-    `${lines}\n` +
-    `</relevant-memories>`
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Deduplication (shared with main plugin)
-// ---------------------------------------------------------------------------
-
-export function deduplicateHits<T extends { summary: string }>(hits: T[]): T[] {
-  const kept: T[] = [];
-  for (const hit of hits) {
-    const dominated = kept.some((k) => {
-      const a = k.summary.toLowerCase();
-      const b = hit.summary.toLowerCase();
-      if (a === b) return true;
-      const wordsA = new Set(a.split(/\s+/).filter((w) => w.length > 1));
-      const wordsB = new Set(b.split(/\s+/).filter((w) => w.length > 1));
-      if (wordsA.size === 0 || wordsB.size === 0) return false;
-      let overlap = 0;
-      for (const w of wordsB) {
-        if (wordsA.has(w)) overlap++;
-      }
-      return overlap / Math.min(wordsA.size, wordsB.size) > 0.7;
-    });
-    if (!dominated) kept.push(hit);
-  }
-  return kept;
-}
-
-// ---------------------------------------------------------------------------
-// Session manager helpers (for maintain() persistence)
-// ---------------------------------------------------------------------------
-
-interface SessionBranchEntry {
-  id: string;
-  type: string;
-  parentId?: string | null;
-  message?: AgentMessage;
-  summary?: string;
-  firstKeptEntryId?: string;
-  tokensBefore?: number;
-  details?: unknown;
-  fromHook?: unknown;
-  thinkingLevel?: string;
-  provider?: string;
-  modelId?: string;
-  customType?: string;
-  data?: unknown;
-  content?: unknown;
-  display?: unknown;
-  name?: string;
-  targetId?: string;
-  label?: string;
-}
-
-interface SessionManagerLike {
-  getBranch(): SessionBranchEntry[];
-  branch(parentId: string): void;
-  resetLeaf(): void;
-  appendMessage(msg: unknown): string;
-  appendCompaction(
-    summary: string,
-    firstKeptEntryId: string,
-    tokensBefore: number,
-    details?: unknown,
-    fromHook?: unknown,
-  ): string;
-  appendThinkingLevelChange(level: string): string;
-  appendModelChange(provider: string, modelId: string): string;
-  appendCustomEntry(customType: string, data: unknown): string;
-  appendCustomMessageEntry(
-    customType: string,
-    content: unknown,
-    display: unknown,
-    details?: unknown,
-  ): string;
-  appendSessionInfo(name: string): string;
-  branchWithSummary(
-    parentId: string | null,
-    summary: string,
-    details?: unknown,
-    fromHook?: unknown,
-  ): string;
-  appendLabelChange(targetId: string, label: string): string;
-}
-
-/**
- * Re-append a branch entry preserving its type. Mirrors the
- * `appendBranchEntry` pattern from OpenClaw's transcript-rewrite module.
- */
-function reappendEntry(sm: SessionManagerLike, entry: SessionBranchEntry): string {
-  switch (entry.type) {
-    case "message":
-      return sm.appendMessage(entry.message);
-    case "compaction":
-      return sm.appendCompaction(
-        entry.summary ?? "",
-        entry.firstKeptEntryId ?? "",
-        entry.tokensBefore ?? 0,
-        entry.details,
-        entry.fromHook,
-      );
-    case "thinking_level_change":
-      return sm.appendThinkingLevelChange(entry.thinkingLevel ?? "");
-    case "model_change":
-      return sm.appendModelChange(entry.provider ?? "", entry.modelId ?? "");
-    case "custom":
-      return sm.appendCustomEntry(entry.customType ?? "", entry.data);
-    case "custom_message":
-      return sm.appendCustomMessageEntry(
-        entry.customType ?? "",
-        entry.content,
-        entry.display,
-        entry.details,
-      );
-    case "session_info":
-      return sm.appendSessionInfo(entry.name ?? "");
-    case "branch_summary":
-      return sm.branchWithSummary(
-        entry.parentId ?? null,
-        entry.summary ?? "",
-        entry.details,
-        entry.fromHook,
-      );
-    default:
-      if (entry.targetId !== undefined && entry.label !== undefined) {
-        return sm.appendLabelChange(entry.targetId, entry.label);
-      }
-      return sm.appendMessage(entry.message);
-  }
-}
-
-/**
- * Insert a synthetic assistant message at the start of the session branch
- * (before any existing entries). Uses the branch-and-reappend pattern.
- */
-export function insertSyntheticAssistantEntry(
-  sm: SessionManagerLike,
-  memoryBlock: string,
-): boolean {
-  const branch = sm.getBranch();
-  if (branch.length === 0) return false;
-
-  const firstEntry = branch[0];
-  if (firstEntry.parentId) {
-    sm.branch(firstEntry.parentId);
-  } else {
-    sm.resetLeaf();
-  }
-
-  sm.appendMessage({
-    role: "assistant",
-    content: [{ type: "text", text: memoryBlock }],
-    timestamp: Date.now(),
-    stopReason: "end_turn",
-    usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, totalTokens: 0 },
-  });
-
-  for (const entry of branch) {
-    reappendEntry(sm, entry);
-  }
-  return true;
-}
-
-/**
- * Find the target assistant entry for memory injection in the session branch.
- * Returns the last assistant entry that appears before the last user entry.
- */
-export function findTargetAssistantEntry(
-  branch: SessionBranchEntry[],
-): SessionBranchEntry | null {
-  let lastUserIdx = -1;
-  for (let i = branch.length - 1; i >= 0; i--) {
-    if (branch[i].type === "message" && branch[i].message?.role === "user") {
-      lastUserIdx = i;
-      break;
-    }
-  }
-  if (lastUserIdx < 0) return null;
-
-  for (let i = lastUserIdx - 1; i >= 0; i--) {
-    if (branch[i].type === "message" && branch[i].message?.role === "assistant") {
-      return branch[i];
-    }
-  }
-  return null;
-}
diff --git a/apps/memos-local-openclaw/src/hub/server.ts b/apps/memos-local-openclaw/src/hub/server.ts
index ec74defa4..d8b697d79 100644
--- a/apps/memos-local-openclaw/src/hub/server.ts
+++ b/apps/memos-local-openclaw/src/hub/server.ts
@@ -658,6 +658,7 @@ export class HubServer {
         id: memoryId,
         sourceChunkId,
         sourceUserId: auth.userId,
+        sourceAgent: String(m.sourceAgent || ""),
         role: String(m.role || "assistant"),
         content: String(m.content || ""),
         summary: String(m.summary || ""),
@@ -713,9 +714,14 @@ export class HubServer {
 
       // Track which IDs are memories vs chunks
       const memoryIdSet = new Set(memFtsHits.map(({ hit }) => hit.id));
+      const ftsHitIdSet = new Set<string>();
+      for (const { hit } of ftsHits) ftsHitIdSet.add(hit.id);
+      for (const { hit } of memFtsHits) ftsHitIdSet.add(hit.id);
 
       // Two-stage retrieval: FTS candidates first, then embed + cosine rerank
       let mergedIds: string[];
+      /** Vector RRF channel: require min cosine similarity unless id is already an FTS hit. */
+      const MIN_VECTOR_SIM = 0.45;
       if (this.opts.embedder) {
         try {
           const [queryVec] = await this.opts.embedder.embed([query]);
@@ -738,8 +744,9 @@ export class HubServer {
               memoryIdSet.add(e.memoryId);
             }
 
-            scored.sort((a, b) => b.score - a.score);
-            const topScored = scored.slice(0, maxResults * 2);
+            const vecCandidates = scored.filter((s) => s.score >= MIN_VECTOR_SIM || ftsHitIdSet.has(s.id));
+            vecCandidates.sort((a, b) => b.score - a.score);
+            const topScored = vecCandidates.slice(0, maxResults * 2);
 
             const K = 60;
             const rrfScores = new Map<string, number>();
@@ -778,8 +785,8 @@ export class HubServer {
           this.remoteHitMap.set(remoteHitId, { chunkId: id, type: "memory", expiresAt: Date.now() + 10 * 60 * 1000, requesterUserId: auth.userId });
           return {
             remoteHitId, summary: mhit.summary, excerpt: mhit.content.slice(0, 240), hubRank: rank + 1,
-            taskTitle: null, ownerName: mhit.owner_name || "unknown", groupName: mhit.group_name,
-            visibility: mhit.visibility, source: { ts: mhit.created_at, role: mhit.role },
+            taskTitle: null, ownerName: mhit.owner_name || "unknown", sourceAgent: (mhit as any).source_agent || "",
+            groupName: mhit.group_name, visibility: mhit.visibility, source: { ts: mhit.created_at, role: mhit.role },
           };
         }
         let hit = ftsMap.get(id);
@@ -792,8 +799,8 @@ export class HubServer {
         this.remoteHitMap.set(remoteHitId, { chunkId: id, type: "chunk", expiresAt: Date.now() + 10 * 60 * 1000, requesterUserId: auth.userId });
         return {
           remoteHitId, summary: hit!.summary, excerpt: hit!.content.slice(0, 240), hubRank: rank + 1,
-          taskTitle: hit!.task_title, ownerName: hit!.owner_name || "unknown", groupName: hit!.group_name,
-          visibility: hit!.visibility, source: { ts: hit!.created_at, role: hit!.role },
+          taskTitle: hit!.task_title, ownerName: hit!.owner_name || "unknown", sourceAgent: "",
+          groupName: hit!.group_name, visibility: hit!.visibility, source: { ts: hit!.created_at, role: hit!.role },
         };
       }).filter(Boolean);
       return this.json(res, 200, { hits, meta: { totalCandidates: hits.length, searchedGroups: [], includedPublic: true } });
diff --git a/apps/memos-local-openclaw/src/ingest/providers/anthropic.ts b/apps/memos-local-openclaw/src/ingest/providers/anthropic.ts
index 3e11d2778..e9845d334 100644
--- a/apps/memos-local-openclaw/src/ingest/providers/anthropic.ts
+++ b/apps/memos-local-openclaw/src/ingest/providers/anthropic.ts
@@ -148,19 +148,22 @@ SAME — the new message:
 - Reports a result, error, or feedback about the current task
 - Discusses different tools or approaches for the SAME goal (e.g., learning English via BBC → via ChatGPT = SAME)
 - Is a short acknowledgment (ok, thanks, 好的) in response to the current flow
+- Contains pronouns or references (那, 这, 它, 其中, 哪些, those, which, what about, etc.) pointing to items from the current conversation
+- Asks about a sub-topic, tool, detail, dimension, or aspect of the current discussion topic
 
 NEW — the new message:
-- Introduces a subject from a DIFFERENT domain than the current task (e.g., tech → cooking, work → personal life, database → travel)
-- Has NO logical connection to what was being discussed
+- Introduces a subject from a COMPLETELY DIFFERENT domain than the current task (e.g., tech → cooking, work → personal life, database → travel)
+- Has NO logical connection to what was being discussed — no shared entities, events, or themes
 - Starts a request about a different project, system, or life area
 - Begins with a new greeting/reset followed by a different topic
 
 Key principles:
-- If the topic domain clearly changed (e.g., server config → recipe, code review → vacation plan), choose NEW
+- Default to SAME unless the topic domain CLEARLY changed. When in doubt, choose SAME.
+- CRITICAL: Short messages (under ~30 characters) that use pronouns or ask "what about X" / "哪些" / "那XX呢" are almost always follow-ups referring to the current topic. Only mark them NEW if they explicitly name a completely unrelated domain.
 - Different aspects of the SAME project/system are SAME (e.g., Nginx SSL → Nginx gzip = SAME)
-- Different unrelated technologies discussed independently are NEW (e.g., Redis config → cooking recipe = NEW)
-- When unsure, lean toward SAME for closely related topics, but do NOT hesitate to mark NEW for obvious domain shifts
-- Examples: "配置Nginx" → "加gzip压缩" = SAME; "配置Nginx" → "做红烧肉" = NEW; "MySQL配置" → "K8s部署" in same infra project = SAME; "部署服务器" → "年会安排" = NEW
+- Asking about tools, systems, or methods for the current topic is SAME (e.g., "港股调研" → "那处理系统有哪些" = SAME; "数据分析" → "用什么工具" = SAME)
+- Different unrelated domains discussed independently are NEW (e.g., Redis config → cooking recipe = NEW)
+- Examples: "配置Nginx" → "加gzip压缩" = SAME; "配置Nginx" → "做红烧肉" = NEW; "港股调研" → "那处理系统有哪些" = SAME; "部署服务器" → "年会安排" = NEW
 
 Output exactly one word: NEW or SAME`;
 
diff --git a/apps/memos-local-openclaw/src/ingest/providers/bedrock.ts b/apps/memos-local-openclaw/src/ingest/providers/bedrock.ts
index d2f582aba..1fcd0b359 100644
--- a/apps/memos-local-openclaw/src/ingest/providers/bedrock.ts
+++ b/apps/memos-local-openclaw/src/ingest/providers/bedrock.ts
@@ -150,19 +150,22 @@ SAME — the new message:
 - Reports a result, error, or feedback about the current task
 - Discusses different tools or approaches for the SAME goal (e.g., learning English via BBC → via ChatGPT = SAME)
 - Is a short acknowledgment (ok, thanks, 好的) in response to the current flow
+- Contains pronouns or references (那, 这, 它, 其中, 哪些, those, which, what about, etc.) pointing to items from the current conversation
+- Asks about a sub-topic, tool, detail, dimension, or aspect of the current discussion topic
 
 NEW — the new message:
-- Introduces a subject from a DIFFERENT domain than the current task (e.g., tech → cooking, work → personal life, database → travel)
-- Has NO logical connection to what was being discussed
+- Introduces a subject from a COMPLETELY DIFFERENT domain than the current task (e.g., tech → cooking, work → personal life, database → travel)
+- Has NO logical connection to what was being discussed — no shared entities, events, or themes
 - Starts a request about a different project, system, or life area
 - Begins with a new greeting/reset followed by a different topic
 
 Key principles:
-- If the topic domain clearly changed (e.g., server config → recipe, code review → vacation plan), choose NEW
+- Default to SAME unless the topic domain CLEARLY changed. When in doubt, choose SAME.
+- CRITICAL: Short messages (under ~30 characters) that use pronouns or ask "what about X" / "哪些" / "那XX呢" are almost always follow-ups referring to the current topic. Only mark them NEW if they explicitly name a completely unrelated domain.
 - Different aspects of the SAME project/system are SAME (e.g., Nginx SSL → Nginx gzip = SAME)
-- Different unrelated technologies discussed independently are NEW (e.g., Redis config → cooking recipe = NEW)
-- When unsure, lean toward SAME for closely related topics, but do NOT hesitate to mark NEW for obvious domain shifts
-- Examples: "配置Nginx" → "加gzip压缩" = SAME; "配置Nginx" → "做红烧肉" = NEW; "MySQL配置" → "K8s部署" in same infra project = SAME; "部署服务器" → "年会安排" = NEW
+- Asking about tools, systems, or methods for the current topic is SAME (e.g., "港股调研" → "那处理系统有哪些" = SAME; "数据分析" → "用什么工具" = SAME)
+- Different unrelated domains discussed independently are NEW (e.g., Redis config → cooking recipe = NEW)
+- Examples: "配置Nginx" → "加gzip压缩" = SAME; "配置Nginx" → "做红烧肉" = NEW; "港股调研" → "那处理系统有哪些" = SAME; "部署服务器" → "年会安排" = NEW
 
 Output exactly one word: NEW or SAME`;
 
diff --git a/apps/memos-local-openclaw/src/ingest/providers/gemini.ts b/apps/memos-local-openclaw/src/ingest/providers/gemini.ts
index b6659b2d1..3fafe570d 100644
--- a/apps/memos-local-openclaw/src/ingest/providers/gemini.ts
+++ b/apps/memos-local-openclaw/src/ingest/providers/gemini.ts
@@ -148,19 +148,22 @@ SAME — the new message:
 - Reports a result, error, or feedback about the current task
 - Discusses different tools or approaches for the SAME goal (e.g., learning English via BBC → via ChatGPT = SAME)
 - Is a short acknowledgment (ok, thanks, 好的) in response to the current flow
+- Contains pronouns or references (那, 这, 它, 其中, 哪些, those, which, what about, etc.) pointing to items from the current conversation
+- Asks about a sub-topic, tool, detail, dimension, or aspect of the current discussion topic
 
 NEW — the new message:
-- Introduces a subject from a DIFFERENT domain than the current task (e.g., tech → cooking, work → personal life, database → travel)
-- Has NO logical connection to what was being discussed
+- Introduces a subject from a COMPLETELY DIFFERENT domain than the current task (e.g., tech → cooking, work → personal life, database → travel)
+- Has NO logical connection to what was being discussed — no shared entities, events, or themes
 - Starts a request about a different project, system, or life area
 - Begins with a new greeting/reset followed by a different topic
 
 Key principles:
-- If the topic domain clearly changed (e.g., server config → recipe, code review → vacation plan), choose NEW
+- Default to SAME unless the topic domain CLEARLY changed. When in doubt, choose SAME.
+- CRITICAL: Short messages (under ~30 characters) that use pronouns or ask "what about X" / "哪些" / "那XX呢" are almost always follow-ups referring to the current topic. Only mark them NEW if they explicitly name a completely unrelated domain.
 - Different aspects of the SAME project/system are SAME (e.g., Nginx SSL → Nginx gzip = SAME)
-- Different unrelated technologies discussed independently are NEW (e.g., Redis config → cooking recipe = NEW)
-- When unsure, lean toward SAME for closely related topics, but do NOT hesitate to mark NEW for obvious domain shifts
-- Examples: "配置Nginx" → "加gzip压缩" = SAME; "配置Nginx" → "做红烧肉" = NEW; "MySQL配置" → "K8s部署" in same infra project = SAME; "部署服务器" → "年会安排" = NEW
+- Asking about tools, systems, or methods for the current topic is SAME (e.g., "港股调研" → "那处理系统有哪些" = SAME; "数据分析" → "用什么工具" = SAME)
+- Different unrelated domains discussed independently are NEW (e.g., Redis config → cooking recipe = NEW)
+- Examples: "配置Nginx" → "加gzip压缩" = SAME; "配置Nginx" → "做红烧肉" = NEW; "港股调研" → "那处理系统有哪些" = SAME; "部署服务器" → "年会安排" = NEW
 
 Output exactly one word: NEW or SAME`;
 
diff --git a/apps/memos-local-openclaw/src/ingest/providers/index.ts b/apps/memos-local-openclaw/src/ingest/providers/index.ts
index 99db7b63e..b08818520 100644
--- a/apps/memos-local-openclaw/src/ingest/providers/index.ts
+++ b/apps/memos-local-openclaw/src/ingest/providers/index.ts
@@ -1,9 +1,9 @@
 import * as fs from "fs";
 import * as path from "path";
-import type { SummarizerConfig, SummaryProvider, Logger } from "../../types";
-import { summarizeOpenAI, summarizeTaskOpenAI, generateTaskTitleOpenAI, judgeNewTopicOpenAI, filterRelevantOpenAI, judgeDedupOpenAI } from "./openai";
-import type { FilterResult, DedupResult } from "./openai";
-export type { FilterResult, DedupResult } from "./openai";
+import type { SummarizerConfig, SummaryProvider, Logger, OpenClawAPI } from "../../types";
+import { summarizeOpenAI, summarizeTaskOpenAI, generateTaskTitleOpenAI, judgeNewTopicOpenAI, classifyTopicOpenAI, arbitrateTopicSplitOpenAI, filterRelevantOpenAI, judgeDedupOpenAI, parseFilterResult, parseDedupResult, parseTopicClassifyResult } from "./openai";
+import type { FilterResult, DedupResult, TopicClassifyResult } from "./openai";
+export type { FilterResult, DedupResult, TopicClassifyResult } from "./openai";
 import { summarizeAnthropic, summarizeTaskAnthropic, generateTaskTitleAnthropic, judgeNewTopicAnthropic, filterRelevantAnthropic, judgeDedupAnthropic } from "./anthropic";
 import { summarizeGemini, summarizeTaskGemini, generateTaskTitleGemini, judgeNewTopicGemini, filterRelevantGemini, judgeDedupGemini } from "./gemini";
 import { summarizeBedrock, summarizeTaskBedrock, generateTaskTitleBedrock, judgeNewTopicBedrock, filterRelevantBedrock, judgeDedupBedrock } from "./bedrock";
@@ -287,25 +287,30 @@ export class Summarizer {
   }
 
   async judgeNewTopic(currentContext: string, newMessage: string): Promise<boolean | null> {
-    const chain: SummarizerConfig[] = [];
-    if (this.strongCfg) chain.push(this.strongCfg);
-    if (this.fallbackCfg) chain.push(this.fallbackCfg);
-    if (chain.length === 0 && this.cfg) chain.push(this.cfg);
-    if (chain.length === 0) return null;
+    const result = await this.tryChain("judgeNewTopic", (cfg) =>
+      cfg.provider === "openclaw"
+        ? this.judgeNewTopicOpenClaw(currentContext, newMessage)
+        : callTopicJudge(cfg, currentContext, newMessage, this.log),
+    );
+    return result ?? null;
+  }
 
-    for (let i = 0; i < chain.length; i++) {
-      const modelInfo = `${chain[i].provider}/${chain[i].model ?? "?"}`;
-      try {
-        const result = await callTopicJudge(chain[i], currentContext, newMessage, this.log);
-        modelHealth.recordSuccess("judgeNewTopic", modelInfo);
-        return result;
-      } catch (err) {
-        const level = i < chain.length - 1 ? "warn" : "error";
-        this.log[level](`judgeNewTopic failed (${modelInfo}), ${i < chain.length - 1 ? "trying next" : "no more fallbacks"}: ${err}`);
-        modelHealth.recordError("judgeNewTopic", modelInfo, String(err));
-      }
-    }
-    return null;
+  async classifyTopic(taskState: string, newMessage: string): Promise<TopicClassifyResult | null> {
+    const result = await this.tryChain("classifyTopic", (cfg) =>
+      cfg.provider === "openclaw"
+        ? this.classifyTopicOpenClaw(taskState, newMessage)
+        : callTopicClassifier(cfg, taskState, newMessage, this.log),
+    );
+    return result ?? null;
+  }
+
+  async arbitrateTopicSplit(taskState: string, newMessage: string): Promise<string | null> {
+    const result = await this.tryChain("arbitrateTopicSplit", (cfg) =>
+      cfg.provider === "openclaw"
+        ? this.arbitrateTopicSplitOpenClaw(taskState, newMessage)
+        : callTopicArbitration(cfg, taskState, newMessage, this.log),
+    );
+    return result ?? null;
   }
 
   async filterRelevant(
@@ -346,8 +351,19 @@ export class Summarizer {
 
   static readonly OPENCLAW_TOPIC_JUDGE_PROMPT = `You are a conversation topic change detector.
 Given a CURRENT CONVERSATION SUMMARY and a NEW USER MESSAGE, decide: has the user started a COMPLETELY NEW topic that is unrelated to the current conversation?
+Default to SAME unless the domain clearly changed. If the new message shares the same person, event, entity, or theme with the current conversation, answer SAME.
+CRITICAL: Short messages (under ~30 characters) that use pronouns (那/这/它/哪些) or ask about tools/details/dimensions of the current topic are almost always follow-ups — answer SAME unless they explicitly name a completely unrelated domain.
 Reply with a single word: "NEW" if topic changed, "SAME" if it continues.`;
 
+  static readonly OPENCLAW_TOPIC_CLASSIFIER_PROMPT = `Classify if NEW MESSAGE continues current task or starts an unrelated one.
+Output ONLY JSON: {"d":"S"|"N","c":0.0-1.0}
+d=S(same) or N(new). c=confidence. Default S. Only N if completely unrelated domain.
+Sub-questions, tools, methods, details of current topic = S.`;
+
+  static readonly OPENCLAW_TOPIC_ARBITRATION_PROMPT = `A classifier flagged this message as possibly new topic (low confidence). Is it truly UNRELATED, or a sub-question/follow-up?
+Tools/methods/details of current task = SAME. Shared entity/theme = SAME. Entirely different domain = NEW.
+Reply one word: NEW or SAME`;
+
   static readonly OPENCLAW_FILTER_RELEVANT_PROMPT = `You are a memory relevance judge.
 Given a QUERY and CANDIDATE memories, decide: does each candidate help answer the query?
 RULES:
@@ -433,6 +449,45 @@ Reply with JSON: {"action":"MERGE","mergeTarget":2,"reason":"..."} or {"action":
     return answer.startsWith("NEW");
   }
 
+  private async classifyTopicOpenClaw(taskState: string, newMessage: string): Promise<TopicClassifyResult> {
+    this.requireOpenClawAPI();
+    const prompt = [
+      Summarizer.OPENCLAW_TOPIC_CLASSIFIER_PROMPT,
+      ``,
+      `TASK:\n${taskState}`,
+      `\nMSG:\n${newMessage}`,
+    ].join("\n");
+
+    const response = await this.openclawAPI!.complete({
+      prompt,
+      maxTokens: 60,
+      temperature: 0,
+      model: this.cfg?.model,
+    });
+
+    return parseTopicClassifyResult(response.text.trim(), this.log);
+  }
+
+  private async arbitrateTopicSplitOpenClaw(taskState: string, newMessage: string): Promise<string> {
+    this.requireOpenClawAPI();
+    const prompt = [
+      Summarizer.OPENCLAW_TOPIC_ARBITRATION_PROMPT,
+      ``,
+      `TASK:\n${taskState}`,
+      `\nMSG:\n${newMessage}`,
+    ].join("\n");
+
+    const response = await this.openclawAPI!.complete({
+      prompt,
+      maxTokens: 10,
+      temperature: 0,
+      model: this.cfg?.model,
+    });
+
+    const answer = response.text.trim().toUpperCase();
+    return answer.startsWith("NEW") ? "NEW" : "SAME";
+  }
+
   private async filterRelevantOpenClaw(
     query: string,
     candidates: Array<{ index: number; role: string; content: string; time?: string }>,
@@ -643,6 +698,52 @@ function callJudgeDedup(cfg: SummarizerConfig, newSummary: string, candidates: A
   }
 }
 
+function callTopicClassifier(cfg: SummarizerConfig, taskState: string, newMessage: string, log: Logger): Promise<TopicClassifyResult> {
+  switch (cfg.provider) {
+    case "openai":
+    case "openai_compatible":
+    case "azure_openai":
+    case "zhipu":
+    case "siliconflow":
+    case "deepseek":
+    case "moonshot":
+    case "bailian":
+    case "cohere":
+    case "mistral":
+    case "voyage":
+      return classifyTopicOpenAI(taskState, newMessage, cfg, log);
+    case "anthropic":
+    case "gemini":
+    case "bedrock":
+      return classifyTopicOpenAI(taskState, newMessage, cfg, log);
+    default:
+      throw new Error(`Unknown summarizer provider: ${cfg.provider}`);
+  }
+}
+
+function callTopicArbitration(cfg: SummarizerConfig, taskState: string, newMessage: string, log: Logger): Promise<string> {
+  switch (cfg.provider) {
+    case "openai":
+    case "openai_compatible":
+    case "azure_openai":
+    case "zhipu":
+    case "siliconflow":
+    case "deepseek":
+    case "moonshot":
+    case "bailian":
+    case "cohere":
+    case "mistral":
+    case "voyage":
+      return arbitrateTopicSplitOpenAI(taskState, newMessage, cfg, log);
+    case "anthropic":
+    case "gemini":
+    case "bedrock":
+      return arbitrateTopicSplitOpenAI(taskState, newMessage, cfg, log);
+    default:
+      throw new Error(`Unknown summarizer provider: ${cfg.provider}`);
+  }
+}
+
 // ─── Fallbacks ───
 
 function ruleFallback(text: string): string {
diff --git a/apps/memos-local-openclaw/src/ingest/providers/openai.ts b/apps/memos-local-openclaw/src/ingest/providers/openai.ts
index 23d8a9fe6..825e2131d 100644
--- a/apps/memos-local-openclaw/src/ingest/providers/openai.ts
+++ b/apps/memos-local-openclaw/src/ingest/providers/openai.ts
@@ -188,19 +188,26 @@ SAME — the new message:
 - Reports a result, error, or feedback about the current task
 - Discusses different tools or approaches for the SAME goal (e.g., learning English via BBC → via ChatGPT = SAME)
 - Is a short acknowledgment (ok, thanks, 好的) in response to the current flow
+- Is a follow-up, update, or different angle on the same news event, person, or story
+- Shares the same core entity (person, company, event) even if the specific detail or angle differs
+- Contains pronouns or references (那, 这, 它, 其中, 哪些, those, which, what about, etc.) pointing to items from the current conversation
+- Asks about a sub-topic, tool, detail, dimension, or aspect of the current discussion topic
 
 NEW — the new message:
-- Introduces a subject from a DIFFERENT domain than the current task (e.g., tech → cooking, work → personal life, database → travel)
-- Has NO logical connection to what was being discussed
+- Introduces a subject from a COMPLETELY DIFFERENT domain than the current task (e.g., tech → cooking, work → personal life, database → travel)
+- Has NO logical connection to what was being discussed — no shared entities, events, or themes
 - Starts a request about a different project, system, or life area
 - Begins with a new greeting/reset followed by a different topic
 
 Key principles:
-- If the topic domain clearly changed (e.g., server config → recipe, code review → vacation plan), choose NEW
+- Default to SAME unless the topic domain CLEARLY changed. When in doubt, choose SAME.
+- CRITICAL: Short messages (under ~30 characters) that use pronouns or ask "what about X" / "哪些" / "那XX呢" are almost always follow-ups referring to the current topic. Only mark them NEW if they explicitly name a completely unrelated domain.
+- If the new message mentions the same person, event, product, or entity as the current task, it is SAME regardless of the angle
 - Different aspects of the SAME project/system are SAME (e.g., Nginx SSL → Nginx gzip = SAME)
-- Different unrelated technologies discussed independently are NEW (e.g., Redis config → cooking recipe = NEW)
-- When unsure, lean toward SAME for closely related topics, but do NOT hesitate to mark NEW for obvious domain shifts
-- Examples: "配置Nginx" → "加gzip压缩" = SAME; "配置Nginx" → "做红烧肉" = NEW; "MySQL配置" → "K8s部署" in same infra project = SAME; "部署服务器" → "年会安排" = NEW
+- Asking about tools, systems, or methods for the current topic is SAME (e.g., "港股调研" → "那处理系统有哪些" = SAME; "数据分析" → "用什么工具" = SAME)
+- Follow-up news about the same event is SAME (e.g., "博士失联" → "博士遗体被找到" = SAME; "产品发布" → "产品销量" = SAME)
+- Different unrelated domains discussed independently are NEW (e.g., Redis config → cooking recipe = NEW)
+- Examples: "配置Nginx" → "加gzip压缩" = SAME; "配置Nginx" → "做红烧肉" = NEW; "港股调研" → "那处理系统有哪些" = SAME; "部署服务器" → "年会安排" = NEW
 
 Output exactly one word: NEW or SAME`;
 
@@ -246,6 +253,134 @@ export async function judgeNewTopicOpenAI(
   return answer.startsWith("NEW");
 }
 
+// ─── Structured Topic Classifier ───
+
+export interface TopicClassifyResult {
+  decision: "NEW" | "SAME";
+  confidence: number;
+  boundaryType: string;
+  reason: string; // may be empty for compact responses
+}
+
+const TOPIC_CLASSIFIER_PROMPT = `Classify if NEW MESSAGE continues current task or starts an unrelated one.
+Output ONLY JSON: {"d":"S"|"N","c":0.0-1.0}
+d=S(same) or N(new). c=confidence. Default S. Only N if completely unrelated domain.
+Sub-questions, tools, methods, details of current topic = S.`;
+
+export async function classifyTopicOpenAI(
+  taskState: string,
+  newMessage: string,
+  cfg: SummarizerConfig,
+  log: Logger,
+): Promise<TopicClassifyResult> {
+  const endpoint = normalizeChatEndpoint(cfg.endpoint ?? "https://api.openai.com/v1/chat/completions");
+  const model = cfg.model ?? "gpt-4o-mini";
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+    Authorization: `Bearer ${cfg.apiKey}`,
+    ...cfg.headers,
+  };
+
+  const userContent = `TASK:\n${taskState}\n\nMSG:\n${newMessage}`;
+
+  const resp = await fetch(endpoint, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(buildRequestBody(cfg, {
+      model,
+      temperature: 0,
+      max_tokens: 60,
+      messages: [
+        { role: "system", content: TOPIC_CLASSIFIER_PROMPT },
+        { role: "user", content: userContent },
+      ],
+    })),
+    signal: AbortSignal.timeout(cfg.timeoutMs ?? 15_000),
+  });
+
+  if (!resp.ok) {
+    const body = await resp.text();
+    throw new Error(`OpenAI topic-classifier failed (${resp.status}): ${body}`);
+  }
+
+  const json = (await resp.json()) as { choices: Array<{ message: { content: string } }> };
+  const raw = json.choices[0]?.message?.content?.trim() ?? "";
+  log.debug(`Topic classifier raw: "${raw}"`);
+
+  return parseTopicClassifyResult(raw, log);
+}
+
+const TOPIC_ARBITRATION_PROMPT = `A classifier flagged this message as possibly new topic (low confidence). Is it truly UNRELATED, or a sub-question/follow-up?
+Tools/methods/details of current task = SAME. Shared entity/theme = SAME. Entirely different domain = NEW.
+Reply one word: NEW or SAME`;
+
+export async function arbitrateTopicSplitOpenAI(
+  taskState: string,
+  newMessage: string,
+  cfg: SummarizerConfig,
+  log: Logger,
+): Promise<string> {
+  const endpoint = normalizeChatEndpoint(cfg.endpoint ?? "https://api.openai.com/v1/chat/completions");
+  const model = cfg.model ?? "gpt-4o-mini";
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+    Authorization: `Bearer ${cfg.apiKey}`,
+    ...cfg.headers,
+  };
+
+  const userContent = `TASK:\n${taskState}\n\nMSG:\n${newMessage}`;
+
+  const resp = await fetch(endpoint, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(buildRequestBody(cfg, {
+      model,
+      temperature: 0,
+      max_tokens: 10,
+      messages: [
+        { role: "system", content: TOPIC_ARBITRATION_PROMPT },
+        { role: "user", content: userContent },
+      ],
+    })),
+    signal: AbortSignal.timeout(cfg.timeoutMs ?? 15_000),
+  });
+
+  if (!resp.ok) {
+    const body = await resp.text();
+    throw new Error(`OpenAI topic-arbitration failed (${resp.status}): ${body}`);
+  }
+
+  const json = (await resp.json()) as { choices: Array<{ message: { content: string } }> };
+  const answer = json.choices[0]?.message?.content?.trim().toUpperCase() ?? "";
+  log.debug(`Topic arbitration result: "${answer}"`);
+  return answer.startsWith("NEW") ? "NEW" : "SAME";
+}
+
+export function parseTopicClassifyResult(raw: string, log: Logger): TopicClassifyResult {
+  try {
+    const jsonMatch = raw.match(/\{[\s\S]*\}/);
+    if (jsonMatch) {
+      const p = JSON.parse(jsonMatch[0]);
+      const decision: "NEW" | "SAME" =
+        (p.d === "N" || p.decision === "NEW") ? "NEW" : "SAME";
+      const confidence: number =
+        typeof p.c === "number" ? p.c : typeof p.confidence === "number" ? p.confidence : 0.5;
+      return {
+        decision,
+        confidence,
+        boundaryType: p.boundaryType || "",
+        reason: p.reason || "",
+      };
+    }
+  } catch (err) {
+    log.debug(`Failed to parse topic classify JSON: ${err}`);
+  }
+  const upper = raw.toUpperCase();
+  if (upper.startsWith("NEW") || upper.startsWith("N"))
+    return { decision: "NEW", confidence: 0.5, boundaryType: "", reason: "parse fallback" };
+  return { decision: "SAME", confidence: 0.5, boundaryType: "", reason: "parse fallback" };
+}
+
 const FILTER_RELEVANT_PROMPT = `You are a memory relevance judge.
 
 Given a QUERY and CANDIDATE memories, decide: does each candidate's content contain information that would HELP ANSWER the query?
diff --git a/apps/memos-local-openclaw/src/ingest/task-processor.ts b/apps/memos-local-openclaw/src/ingest/task-processor.ts
index 67cca0fd4..29f0d796f 100644
--- a/apps/memos-local-openclaw/src/ingest/task-processor.ts
+++ b/apps/memos-local-openclaw/src/ingest/task-processor.ts
@@ -51,6 +51,9 @@ export class TaskProcessor {
    * Determines if a new task boundary was crossed and handles transition.
    */
   async onChunksIngested(sessionKey: string, latestTimestamp: number, owner?: string): Promise<void> {
+    if (sessionKey.startsWith("temp:") || sessionKey.startsWith("internal:") || sessionKey.startsWith("system:")) {
+      return;
+    }
     const resolvedOwner = owner ?? "agent:main";
     this.ctx.log.debug(`TaskProcessor.onChunksIngested called session=${sessionKey} ts=${latestTimestamp} owner=${resolvedOwner} processing=${this.processing}`);
     this.pendingEvents.push({ sessionKey, latestTimestamp, owner: resolvedOwner });
@@ -79,13 +82,19 @@ export class TaskProcessor {
     }
   }
 
+  private static extractAgentPrefix(sessionKey: string): string {
+    const parts = sessionKey.split(":");
+    return parts.length >= 3 ? parts.slice(0, 3).join(":") : sessionKey;
+  }
+
   private async detectAndProcess(sessionKey: string, latestTimestamp: number, owner: string): Promise<void> {
     this.ctx.log.debug(`TaskProcessor.detectAndProcess session=${sessionKey} owner=${owner}`);
 
+    const currentAgentPrefix = TaskProcessor.extractAgentPrefix(sessionKey);
     const allActive = this.store.getAllActiveTasks(owner);
     for (const t of allActive) {
-      if (t.sessionKey !== sessionKey) {
-        this.ctx.log.info(`Session changed: finalizing task=${t.id} from session=${t.sessionKey} (owner=${owner})`);
+      if (t.sessionKey !== sessionKey && TaskProcessor.extractAgentPrefix(t.sessionKey) === currentAgentPrefix) {
+        this.ctx.log.info(`Session changed within agent: finalizing task=${t.id} from session=${t.sessionKey} (owner=${owner})`);
         await this.finalizeTask(t);
       }
     }
@@ -179,26 +188,36 @@ export class TaskProcessor {
         continue;
       }
 
-      // LLM topic judgment — check this single user message against full task context
-      const context = this.buildContextSummary(currentTaskChunks);
+      // Structured topic classification
+      const taskState = this.buildTopicJudgeState(currentTaskChunks, userChunk);
       const newMsg = userChunk.content.slice(0, 500);
-      this.ctx.log.info(`Topic judge: "${newMsg.slice(0, 60)}" vs ${existingUserCount} user turns`);
-      const isNew = await this.summarizer.judgeNewTopic(context, newMsg);
-      this.ctx.log.info(`Topic judge result: ${isNew === null ? "null(fallback)" : isNew ? "NEW" : "SAME"}`);
+      this.ctx.log.info(`Topic classify: "${newMsg.slice(0, 60)}" vs ${existingUserCount} user turns`);
+      const result = await this.summarizer.classifyTopic(taskState, newMsg);
+      this.ctx.log.info(`Topic classify: decision=${result?.decision ?? "null"} confidence=${result?.confidence ?? "?"} type=${result?.boundaryType ?? "?"} reason=${result?.reason ?? ""}`);
 
-      if (isNew === null) {
+      if (!result || result.decision === "SAME") {
         this.assignChunksToTask(turn, currentTask.id);
         currentTaskChunks = currentTaskChunks.concat(turn);
         continue;
       }
 
-      if (isNew) {
-        this.ctx.log.info(`Task boundary at turn ${i}: LLM judged new topic. Msg: "${newMsg.slice(0, 80)}..."`);
-        await this.finalizeTask(currentTask);
-        currentTask = await this.createNewTaskReturn(sessionKey, userChunk.createdAt, owner);
-        currentTaskChunks = [];
+      // Low-confidence NEW: second-pass arbitration
+      if (result.confidence < 0.65) {
+        this.ctx.log.info(`Low confidence NEW (${result.confidence}), running second-pass arbitration...`);
+        const secondResult = await this.summarizer.arbitrateTopicSplit(taskState, newMsg);
+        this.ctx.log.info(`Second-pass result: ${secondResult ?? "null(fallback->SAME)"}`);
+        if (!secondResult || secondResult !== "NEW") {
+          this.assignChunksToTask(turn, currentTask.id);
+          currentTaskChunks = currentTaskChunks.concat(turn);
+          continue;
+        }
       }
 
+      this.ctx.log.info(`Task boundary at turn ${i}: classifier judged NEW (confidence=${result.confidence}). Msg: "${newMsg.slice(0, 80)}..."`);
+      await this.finalizeTask(currentTask);
+      currentTask = await this.createNewTaskReturn(sessionKey, userChunk.createdAt, owner);
+      currentTaskChunks = [];
+
       this.assignChunksToTask(turn, currentTask.id);
       currentTaskChunks = currentTaskChunks.concat(turn);
     }
@@ -226,38 +245,39 @@ export class TaskProcessor {
   }
 
   /**
-   * Build context from existing task chunks for the LLM topic judge.
-   * Includes both the task's opening topic and recent exchanges,
-   * so the LLM understands both what the task was originally about
-   * and where the conversation currently is.
-   *
-   * For user messages, include full content (up to 500 chars) since
-   * they carry the topic signal. For assistant messages, use summary
-   * or truncated content since they mostly elaborate.
+   * Build compact task state for the LLM topic classifier.
+   * Includes: topic (first user msg), last 3 turn summaries,
+   * and optional assistant snippet for short/ambiguous messages.
    */
-  private buildContextSummary(chunks: Chunk[]): string {
-    const conversational = chunks.filter((c) => c.role === "user" || c.role === "assistant");
-    if (conversational.length === 0) return "";
-
-    const formatChunk = (c: Chunk) => {
-      const label = c.role === "user" ? "User" : "Assistant";
-      const maxLen = c.role === "user" ? 500 : 200;
-      const text = c.summary || c.content.slice(0, maxLen);
-      return `[${label}]: ${text}`;
-    };
+  private buildTopicJudgeState(chunks: Chunk[], newUserChunk: Chunk): string {
+    const conv = chunks.filter((c) => c.role === "user" || c.role === "assistant");
+    if (conv.length === 0) return "";
+
+    const firstUser = conv.find((c) => c.role === "user");
+    const topic = firstUser?.summary || firstUser?.content.slice(0, 80) || "";
+
+    const turns: Array<{ u: string; a: string }> = [];
+    for (let j = 0; j < conv.length; j++) {
+      if (conv[j].role === "user") {
+        const u = conv[j].summary || conv[j].content.slice(0, 60);
+        const nextA = conv[j + 1]?.role === "assistant" ? conv[j + 1] : null;
+        const a = nextA ? (nextA.summary || nextA.content.slice(0, 60)) : "";
+        turns.push({ u, a });
+      }
+    }
+
+    const recent = turns.slice(-3);
+    const turnLines = recent.map((t, i) => `${i + 1}. U:${t.u} A:${t.a}`);
 
-    if (conversational.length <= 10) {
-      return conversational.map(formatChunk).join("\n");
+    let snippet = "";
+    if (newUserChunk.content.length < 30 || /^[那这它其还哪啥]/.test(newUserChunk.content.trim())) {
+      const lastA = [...conv].reverse().find((c) => c.role === "assistant");
+      if (lastA) snippet = lastA.content.slice(0, 200);
     }
 
-    const opening = conversational.slice(0, 6).map(formatChunk);
-    const recent = conversational.slice(-4).map(formatChunk);
-    return [
-      "--- Task opening ---",
-      ...opening,
-      "--- Recent exchanges ---",
-      ...recent,
-    ].join("\n");
+    const parts = [`topic:${topic}`, ...turnLines];
+    if (snippet) parts.push(`lastA:${snippet}`);
+    return parts.join("\n");
   }
 
   private async createNewTaskReturn(sessionKey: string, timestamp: number, owner: string = "agent:main"): Promise<Task> {
diff --git a/apps/memos-local-openclaw/src/ingest/worker.ts b/apps/memos-local-openclaw/src/ingest/worker.ts
index 55d1718b9..d62ab4a2a 100644
--- a/apps/memos-local-openclaw/src/ingest/worker.ts
+++ b/apps/memos-local-openclaw/src/ingest/worker.ts
@@ -25,8 +25,14 @@ export class IngestWorker {
 
   getTaskProcessor(): TaskProcessor { return this.taskProcessor; }
 
+  private static isEphemeralSession(sessionKey: string): boolean {
+    return sessionKey.startsWith("temp:") || sessionKey.startsWith("internal:") || sessionKey.startsWith("system:");
+  }
+
   enqueue(messages: ConversationMessage[]): void {
-    this.queue.push(...messages);
+    const filtered = messages.filter((m) => !IngestWorker.isEphemeralSession(m.sessionKey));
+    if (filtered.length === 0) return;
+    this.queue.push(...filtered);
     if (!this.processing) {
       this.processQueue().catch((err) => {
         this.ctx.log.error(`Ingest worker error: ${err}`);
@@ -150,14 +156,23 @@ export class IngestWorker {
     let mergeHistory = "[]";
 
     // Fast path: exact content_hash match within same owner (agent dimension)
+    // Strategy: retire the OLD chunk, keep the NEW one active (latest wins)
     const chunkOwner = msg.owner ?? "agent:main";
     const existingByHash = this.store.findActiveChunkByHash(content, chunkOwner);
     if (existingByHash) {
-      this.ctx.log.debug(`Exact-dup (owner=${chunkOwner}): hash match → existing=${existingByHash}`);
+      this.ctx.log.debug(`Exact-dup (owner=${chunkOwner}): hash match → retiring old=${existingByHash}, keeping new=${chunkId}`);
       this.store.recordMergeHit(existingByHash, "DUPLICATE", "exact content hash match");
-      dedupStatus = "duplicate";
-      dedupTarget = existingByHash;
+      const oldChunk = this.store.getChunk(existingByHash);
+      this.store.markDedupStatus(existingByHash, "duplicate", chunkId, "exact content hash match");
+      this.store.deleteEmbedding(existingByHash);
+      mergedFromOld = existingByHash;
       dedupReason = "exact content hash match";
+      if (oldChunk) {
+        const oldHistory = JSON.parse(oldChunk.mergeHistory || "[]");
+        oldHistory.push({ action: "duplicate_superseded", at: Date.now(), reason: "exact content hash match", sourceChunkId: existingByHash });
+        mergeHistory = JSON.stringify(oldHistory);
+        mergeCount = (oldChunk.mergeCount || 0) + 1;
+      }
     }
 
     // Smart dedup: find Top-5 similar chunks, then ask LLM to judge
@@ -173,8 +188,9 @@ export class IngestWorker {
             index: i + 1,
             summary: chunk?.summary ?? "",
             chunkId: s.chunkId,
+            role: chunk?.role,
           };
-        }).filter(c => c.summary);
+        }).filter(c => c.summary && c.role === msg.role);
 
         if (candidates.length > 0) {
           const dedupResult = await this.summarizer.judgeDedup(summary, candidates);
@@ -183,10 +199,18 @@ export class IngestWorker {
             const targetChunkId = candidates[dedupResult.targetIndex - 1]?.chunkId;
             if (targetChunkId) {
               this.store.recordMergeHit(targetChunkId, "DUPLICATE", dedupResult.reason);
-              dedupStatus = "duplicate";
-              dedupTarget = targetChunkId;
+              const oldChunk = this.store.getChunk(targetChunkId);
+              this.store.markDedupStatus(targetChunkId, "duplicate", chunkId, dedupResult.reason);
+              this.store.deleteEmbedding(targetChunkId);
+              mergedFromOld = targetChunkId;
               dedupReason = dedupResult.reason;
-              this.ctx.log.debug(`Smart dedup: DUPLICATE → target=${targetChunkId}, storing with status=duplicate, reason: ${dedupResult.reason}`);
+              if (oldChunk) {
+                const oldHistory = JSON.parse(oldChunk.mergeHistory || "[]");
+                oldHistory.push({ action: "duplicate_superseded", at: Date.now(), reason: dedupResult.reason, sourceChunkId: targetChunkId });
+                mergeHistory = JSON.stringify(oldHistory);
+                mergeCount = (oldChunk.mergeCount || 0) + 1;
+              }
+              this.ctx.log.debug(`Smart dedup: DUPLICATE → retiring old=${targetChunkId}, keeping new=${chunkId} active, reason: ${dedupResult.reason}`);
             }
           }
 
@@ -266,9 +290,6 @@ export class IngestWorker {
     }
     this.ctx.log.debug(`Stored chunk=${chunkId} kind=${kind} role=${msg.role} dedup=${dedupStatus} len=${content.length} hasVec=${!!embedding && dedupStatus === "active"}`);
 
-    if (dedupStatus === "duplicate") {
-      return { action: "duplicate", summary, targetChunkId: dedupTarget ?? undefined, reason: dedupReason ?? undefined };
-    }
     if (mergedFromOld) {
       return { action: "merged", chunkId, summary, targetChunkId: mergedFromOld, reason: dedupReason ?? undefined };
     }
diff --git a/apps/memos-local-openclaw/src/recall/engine.ts b/apps/memos-local-openclaw/src/recall/engine.ts
index cca29b8ed..711bde5a0 100644
--- a/apps/memos-local-openclaw/src/recall/engine.ts
+++ b/apps/memos-local-openclaw/src/recall/engine.ts
@@ -77,7 +77,7 @@ export class RecallEngine {
     }
     const shortTerms = [...new Set([...spaceSplit, ...cjkBigrams])];
     const patternHits = shortTerms.length > 0
-      ? this.store.patternSearch(shortTerms, { limit: candidatePool })
+      ? this.store.patternSearch(shortTerms, { limit: candidatePool, ownerFilter })
       : [];
     const patternRanked = patternHits.map((h, i) => ({
       id: h.chunkId,
@@ -234,6 +234,7 @@ export class RecallEngine {
         score: Math.round(candidate.score * 1000) / 1000,
         taskId: chunk.taskId,
         skillId: chunk.skillId,
+        owner: chunk.owner,
         origin: chunk.owner === "public" ? "local-shared" : "local",
         source: {
           ts: chunk.createdAt,
diff --git a/apps/memos-local-openclaw/src/sharing/types.ts b/apps/memos-local-openclaw/src/sharing/types.ts
index aa97a5de1..79f9afe4d 100644
--- a/apps/memos-local-openclaw/src/sharing/types.ts
+++ b/apps/memos-local-openclaw/src/sharing/types.ts
@@ -38,6 +38,7 @@ export interface HubSearchHit {
   hubRank: number;
   taskTitle: string | null;
   ownerName: string;
+  sourceAgent: string;
   groupName: string | null;
   visibility: SharedVisibility;
   source: {
diff --git a/apps/memos-local-openclaw/src/storage/sqlite.ts b/apps/memos-local-openclaw/src/storage/sqlite.ts
index 5bebd07a4..09f9c2bf7 100644
--- a/apps/memos-local-openclaw/src/storage/sqlite.ts
+++ b/apps/memos-local-openclaw/src/storage/sqlite.ts
@@ -110,9 +110,12 @@ export class SqliteStore {
     this.migrateOwnerFields();
     this.migrateSkillVisibility();
     this.migrateSkillEmbeddingsAndFts();
+    this.migrateTaskTopicColumn();
+    this.migrateTaskEmbeddingsAndFts();
     this.migrateFtsToTrigram();
     this.migrateHubTables();
     this.migrateHubFtsToTrigram();
+    this.migrateHubMemorySourceAgent();
     this.migrateLocalSharedTasksOwner();
     this.migrateHubUserIdentityFields();
     this.migrateClientHubConnectionIdentityFields();
@@ -124,6 +127,16 @@ export class SqliteStore {
     this.db.exec("CREATE INDEX IF NOT EXISTS idx_chunks_dedup_created ON chunks(dedup_status, created_at DESC)");
   }
 
+  private migrateHubMemorySourceAgent(): void {
+    try {
+      const cols = this.db.prepare("PRAGMA table_info(hub_memories)").all() as Array<{ name: string }>;
+      if (cols.length > 0 && !cols.some((c) => c.name === "source_agent")) {
+        this.db.exec("ALTER TABLE hub_memories ADD COLUMN source_agent TEXT NOT NULL DEFAULT ''");
+        this.log.info("Migrated: added source_agent column to hub_memories");
+      }
+    } catch { /* table may not exist yet */ }
+  }
+
   private migrateLocalSharedTasksOwner(): void {
     try {
       const cols = this.db.prepare("PRAGMA table_info(local_shared_tasks)").all() as Array<{ name: string }>;
@@ -290,6 +303,55 @@ export class SqliteStore {
     } catch { /* best-effort */ }
   }
 
+  private migrateTaskEmbeddingsAndFts(): void {
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS task_embeddings (
+        task_id    TEXT PRIMARY KEY REFERENCES tasks(id) ON DELETE CASCADE,
+        vector     BLOB NOT NULL,
+        dimensions INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL
+      );
+
+      CREATE VIRTUAL TABLE IF NOT EXISTS tasks_fts USING fts5(
+        summary,
+        topic,
+        content='tasks',
+        content_rowid='rowid',
+        tokenize='trigram'
+      );
+    `);
+
+    try {
+      this.db.exec(`
+        CREATE TRIGGER IF NOT EXISTS tasks_fts_ai AFTER INSERT ON tasks BEGIN
+          INSERT INTO tasks_fts(rowid, summary, topic)
+          VALUES (new.rowid, new.summary, COALESCE(new.topic, ''));
+        END;
+        CREATE TRIGGER IF NOT EXISTS tasks_fts_ad AFTER DELETE ON tasks BEGIN
+          INSERT INTO tasks_fts(tasks_fts, rowid, summary, topic)
+          VALUES ('delete', old.rowid, old.summary, COALESCE(old.topic, ''));
+        END;
+        CREATE TRIGGER IF NOT EXISTS tasks_fts_au AFTER UPDATE ON tasks BEGIN
+          INSERT INTO tasks_fts(tasks_fts, rowid, summary, topic)
+          VALUES ('delete', old.rowid, old.summary, COALESCE(old.topic, ''));
+          INSERT INTO tasks_fts(rowid, summary, topic)
+          VALUES (new.rowid, new.summary, COALESCE(new.topic, ''));
+        END;
+      `);
+    } catch {
+      // triggers may already exist
+    }
+
+    try {
+      const count = (this.db.prepare("SELECT COUNT(*) as c FROM tasks_fts").get() as { c: number }).c;
+      const taskCount = (this.db.prepare("SELECT COUNT(*) as c FROM tasks").get() as { c: number }).c;
+      if (count === 0 && taskCount > 0) {
+        this.db.exec("INSERT INTO tasks_fts(rowid, summary, topic) SELECT rowid, summary, COALESCE(topic, '') FROM tasks");
+        this.log.info(`Migrated: backfilled tasks_fts for ${taskCount} tasks`);
+      }
+    } catch { /* best-effort */ }
+  }
+
   private migrateFtsToTrigram(): void {
     // Check if chunks_fts still uses the old tokenizer (porter unicode61)
     try {
@@ -507,6 +569,14 @@ export class SqliteStore {
     }
   }
 
+  private migrateTaskTopicColumn(): void {
+    const cols = this.db.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
+    if (!cols.some((c) => c.name === "topic")) {
+      this.db.exec("ALTER TABLE tasks ADD COLUMN topic TEXT DEFAULT NULL");
+      this.log.info("Migrated: added topic column to tasks");
+    }
+  }
+
   private migrateTaskSkillMeta(): void {
     const cols = this.db.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
     if (!cols.some((c) => c.name === "skill_status")) {
@@ -992,6 +1062,7 @@ export class SqliteStore {
         id              TEXT PRIMARY KEY,
         source_chunk_id TEXT NOT NULL,
         source_user_id  TEXT NOT NULL,
+        source_agent    TEXT NOT NULL DEFAULT '',
         role            TEXT NOT NULL,
         content         TEXT NOT NULL,
         summary         TEXT NOT NULL DEFAULT '',
@@ -1207,7 +1278,7 @@ export class SqliteStore {
 
   // ─── Pattern Search (LIKE-based, for CJK text where FTS tokenization is weak) ───
 
-  patternSearch(patterns: string[], opts: { role?: string; limit?: number } = {}): Array<{ chunkId: string; content: string; role: string; createdAt: number }> {
+  patternSearch(patterns: string[], opts: { role?: string; limit?: number; ownerFilter?: string[] } = {}): Array<{ chunkId: string; content: string; role: string; createdAt: number }> {
     if (patterns.length === 0) return [];
     const limit = opts.limit ?? 10;
 
@@ -1216,13 +1287,21 @@ export class SqliteStore {
     const roleClause = opts.role ? " AND c.role = ?" : "";
     const params: (string | number)[] = patterns.map(p => `%${p}%`);
     if (opts.role) params.push(opts.role);
+
+    let ownerClause = "";
+    if (opts.ownerFilter && opts.ownerFilter.length > 0) {
+      const placeholders = opts.ownerFilter.map(() => "?").join(",");
+      ownerClause = ` AND c.owner IN (${placeholders})`;
+      params.push(...opts.ownerFilter);
+    }
+
     params.push(limit);
 
     try {
       const rows = this.db.prepare(`
         SELECT c.id as chunk_id, c.content, c.role, c.created_at
         FROM chunks c
-        WHERE (${whereClause})${roleClause} AND c.dedup_status = 'active'
+        WHERE (${whereClause})${roleClause}${ownerClause} AND c.dedup_status = 'active'
         ORDER BY c.created_at DESC
         LIMIT ?
       `).all(...params) as Array<{ chunk_id: string; content: string; role: string; created_at: number }>;
@@ -1425,8 +1504,15 @@ export class SqliteStore {
 
   deleteAll(): number {
     this.db.exec("PRAGMA foreign_keys = OFF");
+    try {
+      this.db.exec("DROP TRIGGER IF EXISTS tasks_fts_ai");
+      this.db.exec("DROP TRIGGER IF EXISTS tasks_fts_ad");
+      this.db.exec("DROP TRIGGER IF EXISTS tasks_fts_au");
+      this.db.exec("DELETE FROM tasks_fts");
+    } catch (_) {}
     const tables = [
       "task_skills",
+      "task_embeddings",
       "skill_embeddings",
       "skill_versions",
       "skills",
@@ -1449,6 +1535,7 @@ export class SqliteStore {
       }
     }
     this.db.exec("PRAGMA foreign_keys = ON");
+    this.migrateTaskEmbeddingsAndFts();
     const remaining = this.countChunks();
     return remaining === 0 ? 1 : 0;
   }
@@ -1469,6 +1556,21 @@ export class SqliteStore {
     return result.changes > 0;
   }
 
+  disableSkill(skillId: string): boolean {
+    const skill = this.getSkill(skillId);
+    if (!skill || skill.status === "archived") return false;
+    this.db.prepare("DELETE FROM skill_embeddings WHERE skill_id = ?").run(skillId);
+    this.updateSkill(skillId, { status: "archived", installed: 0 });
+    return true;
+  }
+
+  enableSkill(skillId: string): boolean {
+    const skill = this.getSkill(skillId);
+    if (!skill || skill.status !== "archived") return false;
+    this.updateSkill(skillId, { status: "active" });
+    return true;
+  }
+
   // ─── Task CRUD ───
 
   insertTask(task: Task): void {
@@ -1550,10 +1652,11 @@ export class SqliteStore {
     return rows.map(rowToChunk);
   }
 
-  listTasks(opts: { status?: string; limit?: number; offset?: number; owner?: string } = {}): { tasks: Task[]; total: number } {
+  listTasks(opts: { status?: string; limit?: number; offset?: number; owner?: string; session?: string } = {}): { tasks: Task[]; total: number } {
     const conditions: string[] = [];
     const params: unknown[] = [];
     if (opts.status) { conditions.push("status = ?"); params.push(opts.status); }
+    if (opts.session) { conditions.push("session_key = ?"); params.push(opts.session); }
     if (opts.owner) {
       conditions.push("(owner = ? OR (owner = 'public' AND id IN (SELECT task_id FROM local_shared_tasks WHERE original_owner = ?)))");
       params.push(opts.owner, opts.owner);
@@ -1675,9 +1778,24 @@ export class SqliteStore {
     this.db.prepare(`UPDATE skills SET ${sets.join(", ")} WHERE id = ?`).run(...params);
   }
 
-  listSkills(opts: { status?: string } = {}): Skill[] {
-    const cond = opts.status ? "WHERE status = ?" : "";
-    const params = opts.status ? [opts.status] : [];
+  listSkills(opts: { status?: string; session?: string; owner?: string } = {}): Skill[] {
+    const conditions: string[] = [];
+    const params: unknown[] = [];
+    if (opts.status) { conditions.push("status = ?"); params.push(opts.status); }
+    if (opts.owner) {
+      conditions.push("(owner = ? OR owner = 'public')");
+      params.push(opts.owner);
+    }
+    if (opts.session) {
+      conditions.push(`EXISTS (
+        SELECT 1
+        FROM task_skills ts
+        JOIN tasks t ON t.id = ts.task_id
+        WHERE ts.skill_id = skills.id AND t.session_key = ?
+      )`);
+      params.push(opts.session);
+    }
+    const cond = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
     const rows = this.db.prepare(`SELECT * FROM skills ${cond} ORDER BY updated_at DESC`).all(...params) as SkillRow[];
     return rows.map(rowToSkill);
   }
@@ -1767,6 +1885,61 @@ export class SqliteStore {
     }
   }
 
+  // ─── Task Embeddings & Search ───
+
+  upsertTaskEmbedding(taskId: string, vector: number[]): void {
+    const buf = Buffer.from(new Float32Array(vector).buffer);
+    this.db.prepare(`
+      INSERT OR REPLACE INTO task_embeddings (task_id, vector, dimensions, updated_at)
+      VALUES (?, ?, ?, ?)
+    `).run(taskId, buf, vector.length, Date.now());
+  }
+
+  getTaskEmbeddings(owner?: string): Array<{ taskId: string; vector: number[] }> {
+    let sql = `SELECT te.task_id, te.vector, te.dimensions
+       FROM task_embeddings te
+       JOIN tasks t ON t.id = te.task_id`;
+    const params: any[] = [];
+    if (owner) {
+      sql += ` WHERE (t.owner = ? OR t.owner = 'public')`;
+      params.push(owner);
+    }
+    const rows = this.db.prepare(sql).all(...params) as Array<{ task_id: string; vector: Buffer; dimensions: number }>;
+    return rows.map((r) => ({
+      taskId: r.task_id,
+      vector: Array.from(new Float32Array(r.vector.buffer, r.vector.byteOffset, r.dimensions)),
+    }));
+  }
+
+  taskFtsSearch(query: string, limit: number, owner?: string): Array<{ taskId: string; score: number }> {
+    const sanitized = sanitizeFtsQuery(query);
+    if (!sanitized) return [];
+    try {
+      let sql = `
+        SELECT t.id as task_id, rank
+        FROM tasks_fts f
+        JOIN tasks t ON t.rowid = f.rowid
+        WHERE tasks_fts MATCH ?`;
+      const params: any[] = [sanitized];
+      if (owner) {
+        sql += ` AND (t.owner = ? OR t.owner = 'public')`;
+        params.push(owner);
+      }
+      sql += ` ORDER BY rank LIMIT ?`;
+      params.push(limit);
+      const rows = this.db.prepare(sql).all(...params) as Array<{ task_id: string; rank: number }>;
+      if (rows.length === 0) return [];
+      const maxAbsRank = Math.max(...rows.map((r) => Math.abs(r.rank)));
+      return rows.map((r) => ({
+        taskId: r.task_id,
+        score: maxAbsRank > 0 ? Math.abs(r.rank) / maxAbsRank : 0,
+      }));
+    } catch {
+      this.log.warn(`Task FTS query failed for: "${sanitized}", returning empty`);
+      return [];
+    }
+  }
+
   listPublicSkills(): Skill[] {
     const rows = this.db.prepare("SELECT * FROM skills WHERE visibility = 'public' AND status = 'active' ORDER BY updated_at DESC").all() as SkillRow[];
     return rows.map(rowToSkill);
@@ -2430,9 +2603,10 @@ export class SqliteStore {
 
   upsertHubMemory(memory: HubMemoryRecord): void {
     this.db.prepare(`
-      INSERT INTO hub_memories (id, source_chunk_id, source_user_id, role, content, summary, kind, group_id, visibility, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO hub_memories (id, source_chunk_id, source_user_id, source_agent, role, content, summary, kind, group_id, visibility, created_at, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       ON CONFLICT(source_user_id, source_chunk_id) DO UPDATE SET
+        source_agent = excluded.source_agent,
         role = excluded.role,
         content = excluded.content,
         summary = excluded.summary,
@@ -2441,7 +2615,7 @@ export class SqliteStore {
         visibility = excluded.visibility,
         created_at = excluded.created_at,
         updated_at = excluded.updated_at
-    `).run(memory.id, memory.sourceChunkId, memory.sourceUserId, memory.role, memory.content, memory.summary, memory.kind, memory.groupId, memory.visibility, memory.createdAt, memory.updatedAt);
+    `).run(memory.id, memory.sourceChunkId, memory.sourceUserId, memory.sourceAgent, memory.role, memory.content, memory.summary, memory.kind, memory.groupId, memory.visibility, memory.createdAt, memory.updatedAt);
   }
 
   getHubMemoryBySource(sourceUserId: string, sourceChunkId: string): HubMemoryRecord | null {
@@ -2550,6 +2724,11 @@ export class SqliteStore {
     this.db.prepare("UPDATE local_shared_tasks SET hub_task_id = '', hub_instance_id = '', visibility = 'public', group_id = NULL, synced_chunks = 0 WHERE task_id = ?").run(taskId);
   }
 
+  /** Client UI: remove team_shared_chunks rows for all chunks linked to this task (list badge chunk fallback). */
+  clearTeamSharedChunksForTask(taskId: string): void {
+    this.db.prepare("DELETE FROM team_shared_chunks WHERE chunk_id IN (SELECT id FROM chunks WHERE task_id = ?)").run(taskId);
+  }
+
   clearAllTeamSharingState(): void {
     this.clearTeamSharedChunks();
     this.clearTeamSharedSkills();
@@ -2607,7 +2786,7 @@ export class SqliteStore {
     if (!sanitized) return [];
     const rows = this.db.prepare(`
       SELECT hm.id, hm.content, hm.summary, hm.role, hm.created_at, hm.visibility, '' as group_name, hu.username as owner_name,
-             bm25(hub_memories_fts) as rank
+             COALESCE(hm.source_agent, '') as source_agent, bm25(hub_memories_fts) as rank
       FROM hub_memories_fts f
       JOIN hub_memories hm ON hm.rowid = f.rowid
       LEFT JOIN hub_users hu ON hu.id = hm.source_user_id
@@ -2623,7 +2802,7 @@ export class SqliteStore {
   getVisibleHubSearchHitByMemoryId(memoryId: string, userId: string): HubMemorySearchRow | null {
     const row = this.db.prepare(`
       SELECT hm.id, hm.content, hm.summary, hm.role, hm.created_at, hm.visibility, '' as group_name, hu.username as owner_name,
-             0 as rank
+             COALESCE(hm.source_agent, '') as source_agent, 0 as rank
       FROM hub_memories hm
       LEFT JOIN hub_users hu ON hu.id = hm.source_user_id
       WHERE hm.id = ?
@@ -3117,6 +3296,7 @@ export interface HubMemoryRecord {
   id: string;
   sourceChunkId: string;
   sourceUserId: string;
+  sourceAgent: string;
   role: string;
   content: string;
   summary: string;
@@ -3131,6 +3311,7 @@ interface HubMemoryRow {
   id: string;
   source_chunk_id: string;
   source_user_id: string;
+  source_agent: string;
   role: string;
   content: string;
   summary: string;
@@ -3146,6 +3327,7 @@ function rowToHubMemory(row: HubMemoryRow): HubMemoryRecord {
     id: row.id,
     sourceChunkId: row.source_chunk_id,
     sourceUserId: row.source_user_id,
+    sourceAgent: row.source_agent || "",
     role: row.role,
     content: row.content,
     summary: row.summary,
@@ -3166,6 +3348,7 @@ interface HubMemorySearchRow {
   visibility: string;
   group_name: string | null;
   owner_name: string | null;
+  source_agent: string;
   rank: number;
 }
 
diff --git a/apps/memos-local-openclaw/src/types.ts b/apps/memos-local-openclaw/src/types.ts
index 88a853f09..cb08eb1cf 100644
--- a/apps/memos-local-openclaw/src/types.ts
+++ b/apps/memos-local-openclaw/src/types.ts
@@ -322,6 +322,8 @@ export interface MemosLocalConfig {
   skillEvolution?: SkillEvolutionConfig;
   telemetry?: TelemetryConfig;
   sharing?: SharingConfig;
+  /** Hours of inactivity after which an active task is automatically finalized. 0 = disabled. Default 4. */
+  taskAutoFinalizeHours?: number;
 }
 
 // ─── Defaults ───
@@ -357,6 +359,7 @@ export const DEFAULTS = {
   skillAutoRecallLimit: 2,
   skillPreferUpgrade: true,
   skillRedactSensitive: true,
+  taskAutoFinalizeHours: 4,
 } as const;
 
 // ─── Plugin Hooks (OpenClaw integration) ───
diff --git a/apps/memos-local-openclaw/src/viewer/html.ts b/apps/memos-local-openclaw/src/viewer/html.ts
index 14aecc6fc..5e4456e71 100644
--- a/apps/memos-local-openclaw/src/viewer/html.ts
+++ b/apps/memos-local-openclaw/src/viewer/html.ts
@@ -44,6 +44,7 @@ html{overflow-y:scroll}
 [data-theme="light"] .auth-card{box-shadow:0 25px 50px -12px rgba(0,0,0,.08)}
 [data-theme="light"] .topbar{background:rgba(255,255,255,.92);border-bottom-color:var(--border);backdrop-filter:blur(8px)}
 [data-theme="light"] .session-item .count,[data-theme="light"] .session-tag{background:rgba(0,0,0,.05)}
+[data-theme="light"] .owner-tag{background:rgba(99,102,241,.08);border-color:rgba(99,102,241,.18)}
 [data-theme="light"] .card-content pre{background:#f3f4f6;border-color:var(--border)}
 [data-theme="light"] .vscore-badge{background:rgba(79,70,229,.06);color:#4f46e5}
 [data-theme="light"] ::-webkit-scrollbar-thumb{background:rgba(0,0,0,.15)}
@@ -126,22 +127,24 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .main-content{display:flex;flex:1;max-width:1400px;margin:0 auto;width:100%;padding:28px 32px;gap:28px}
 
 /* ─── Sidebar ─── */
-.sidebar{width:260px;min-width:260px;flex-shrink:0}
-.sidebar .stats-grid{display:grid;grid-template-columns:1fr 1fr;gap:12px;margin-bottom:24px}
-.stat-card{background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius);padding:18px;transition:all .2s}
+.sidebar{width:260px;min-width:260px;flex-shrink:0;position:sticky;top:84px;max-height:calc(100vh - 112px);display:flex;flex-direction:column}
+.sidebar > * {flex-shrink:0}
+.sidebar .stats-grid{display:grid;grid-template-columns:1fr 1fr;gap:8px;margin-bottom:20px}
+.stat-card{background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius);padding:14px 16px;transition:all .2s;position:relative;overflow:hidden}
+.stat-card::before{content:'';position:absolute;top:0;left:0;bottom:0;width:3px;border-radius:3px 0 0 3px;background:var(--border)}
 .stat-card:hover{border-color:var(--border-glow);background:var(--bg-card-hover)}
-.stat-card .stat-value{font-size:22px;font-weight:700;color:var(--text);letter-spacing:-.02em}
-.stat-card .stat-label{font-size:12px;color:var(--text-sec);margin-top:4px;font-weight:500}
+.stat-card .stat-value{font-size:20px;font-weight:700;color:var(--text);letter-spacing:-.02em}
+.stat-card .stat-label{font-size:11px;color:var(--text-sec);margin-top:2px;font-weight:500}
+.stat-card.pri{border-left-color:transparent}.stat-card.pri::before{background:var(--pri)}
 .stat-card.pri .stat-value{color:var(--pri)}
+.stat-card.green{border-left-color:transparent}.stat-card.green::before{background:var(--green)}
 .stat-card.green .stat-value{color:var(--green)}
+.stat-card.amber{border-left-color:transparent}.stat-card.amber::before{background:var(--amber)}
 .stat-card.amber .stat-value{color:var(--amber)}
+.stat-card.rose{border-left-color:transparent}.stat-card.rose::before{background:var(--rose)}
 .stat-card.rose .stat-value{color:var(--rose)}
 
 .sidebar .section-title{font-size:11px;font-weight:600;color:var(--text-muted);text-transform:uppercase;letter-spacing:.08em;margin:24px 0 12px;padding:0 2px}
-.sidebar .session-list{display:flex;flex-direction:column;gap:6px;max-height:280px;overflow-y:auto}
-.session-item{display:flex;align-items:center;justify-content:space-between;padding:10px 14px;background:var(--bg-card);border:1px solid var(--border);border-radius:10px;cursor:pointer;transition:all .15s;font-size:13px;color:var(--text)}
-.session-item:hover{border-color:var(--pri);background:var(--pri-glow)}
-.session-item.active{border-color:var(--pri);background:var(--pri-glow);font-weight:600;color:var(--pri)}
 .session-item .count{color:var(--text-sec);font-size:11px;font-weight:600;background:rgba(0,0,0,.2);padding:3px 8px;border-radius:8px}
 
 .provider-badge{display:inline-flex;align-items:center;gap:6px;padding:6px 12px;background:var(--green-bg);color:var(--green);border-radius:999px;font-size:11px;font-weight:600;margin-top:10px}
@@ -149,11 +152,12 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 
 /* ─── Feed ─── */
 .feed{flex:1;min-width:0}
-.search-bar{display:flex;gap:10px;margin-bottom:16px;position:relative;align-items:center}
+.search-bar{display:flex;gap:10px;margin-bottom:14px;position:relative;align-items:center}
 .search-bar input{flex:1;padding:10px 16px 10px 40px;border:1px solid var(--border);border-radius:10px;font-size:14px;outline:none;background:var(--bg-card);color:var(--text);transition:all .2s}
 .search-bar input::placeholder{color:var(--text-muted)}
 .search-bar input:focus{border-color:var(--pri);box-shadow:0 0 0 3px var(--pri-glow)}
 .search-bar .search-icon{position:absolute;left:14px;top:50%;transform:translateY(-50%);color:var(--text-muted);font-size:14px;pointer-events:none}
+.search-bar .filter-select{padding:8px 14px;padding-right:30px;border-radius:10px;font-size:13px;background:var(--bg-card);flex-shrink:0}
 .search-meta{font-size:12px;color:var(--text-sec);padding:0 2px}.search-meta:not(:empty){margin-bottom:14px}
 .scope-select{padding:10px 12px;border:1px solid var(--border);border-radius:10px;background:var(--bg-card);color:var(--text);font-size:13px;min-width:110px;outline:none}
 .sharing-inline-meta{font-size:12px;color:var(--text-muted);margin:-8px 0 14px 2px}
@@ -370,13 +374,13 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .hub-source-badge{display:inline-flex;align-items:center;gap:6px;padding:4px 8px;border-radius:999px;background:rgba(34,197,94,.12);color:var(--green);font-size:11px;font-weight:700;border:1px solid rgba(34,197,94,.22)}
 @media (max-width: 960px){.sharing-settings-grid{grid-template-columns:1fr}.search-bar{flex-wrap:wrap}.scope-select{width:100%}.task-detail-actions{width:100%;justify-content:flex-start}}
 
-.filter-bar{display:flex;gap:8px;margin-bottom:16px;flex-wrap:wrap}
-.filter-chip{padding:5px 14px;border:1px solid var(--border);border-radius:6px;background:transparent;color:var(--text-sec);font-size:12px;font-weight:500;transition:all .15s}
-.filter-chip:hover{border-color:var(--pri);color:var(--pri)}
-.filter-chip.active{background:rgba(99,102,241,.08);color:var(--pri);border-color:rgba(99,102,241,.25)}
+.filter-bar{display:flex;gap:8px;margin-bottom:12px;flex-wrap:wrap;align-items:center}
+.filter-chip{padding:5px 14px;border:1px solid var(--border);border-radius:8px;background:transparent;color:var(--text-sec);font-size:12px;font-weight:500;cursor:pointer;transition:all .15s}
+.filter-chip:hover{border-color:var(--pri);color:var(--pri);background:rgba(99,102,241,.04)}
+.filter-chip.active{background:rgba(99,102,241,.1);color:var(--pri);border-color:rgba(99,102,241,.3);font-weight:600}
 
-.memory-list{display:flex;flex-direction:column;gap:16px}
-.memory-card{background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius-lg);padding:20px 24px;transition:all .2s}
+.memory-list{display:flex;flex-direction:column;gap:10px}
+.memory-card{background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius);padding:16px 20px;transition:all .2s}
 .memory-card:hover{border-color:var(--border-glow);background:var(--bg-card-hover)}
 .memory-card .card-header{display:flex;align-items:center;justify-content:space-between;margin-bottom:12px;flex-wrap:wrap;gap:8px}
 .memory-card .meta{display:flex;align-items:center;gap:8px}
@@ -385,13 +389,22 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .role-tag.assistant{background:var(--accent-glow);color:var(--accent);border:1px solid rgba(230,57,70,.2)}
 .role-tag.system{background:var(--amber-bg);color:var(--amber);border:1px solid rgba(245,158,11,.2)}
 .card-time{font-size:12px;color:var(--text-sec);display:flex;align-items:center;gap:8px}
-.session-tag{font-size:11px;font-family:ui-monospace,monospace;color:var(--text-muted);background:rgba(0,0,0,.2);padding:3px 8px;border-radius:6px;cursor:default}
+.session-tag{font-size:11px;font-family:ui-monospace,monospace;color:var(--text-muted);background:rgba(0,0,0,.2);padding:3px 8px;border-radius:6px;cursor:pointer}
+.session-tag:hover{filter:brightness(1.12)}
+.owner-tag{font-size:11px;font-weight:600;color:var(--pri);background:var(--pri-glow);padding:3px 9px;border-radius:8px;border:1px solid rgba(99,102,241,.15);cursor:default;white-space:nowrap}
 .card-summary{font-size:15px;font-weight:600;color:var(--text);margin-bottom:10px;line-height:1.5;letter-spacing:-.01em;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden}
 .card-content{font-size:13px;color:var(--text-sec);line-height:1.65;max-height:0;overflow:hidden;transition:max-height .3s ease}
 .card-content.show{max-height:600px;overflow-y:auto}
 .card-content pre{white-space:pre-wrap;word-break:break-all;background:rgba(0,0,0,.25);padding:14px;border-radius:10px;font-size:12px;font-family:ui-monospace,monospace;margin-top:10px;border:1px solid var(--border);color:var(--text-sec)}
 .card-actions{display:flex;align-items:center;gap:8px;margin-top:14px}
 .card-actions-inline{display:inline-flex;align-items:center;gap:4px;margin-left:auto;flex-shrink:0}
+.btn-warn{color:#f59e0b !important}
+.btn-warn:hover{background:rgba(245,158,11,.15) !important}
+.btn-danger{color:#ef4444 !important}
+.btn-danger:hover{background:rgba(239,68,68,.15) !important}
+.btn-success{color:#10b981 !important}
+.btn-success:hover{background:rgba(16,185,129,.15) !important}
+.skill-card.archived{opacity:0.55;border-style:dashed}
 .vscore-badge{display:inline-flex;align-items:center;background:rgba(59,130,246,.15);color:#60a5fa;font-size:10px;font-weight:700;padding:4px 10px;border-radius:8px;margin-left:auto}
 .merge-badge{display:inline-flex;align-items:center;gap:4px;background:rgba(16,185,129,.12);color:#10b981;font-size:10px;font-weight:600;padding:3px 10px;border-radius:8px}
 .merge-history{margin-top:12px;padding:12px 14px;background:rgba(0,0,0,.15);border-radius:10px;border:1px solid var(--border);font-size:12px;line-height:1.7;color:var(--text-sec);max-height:200px;overflow-y:auto}
@@ -573,32 +586,39 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 ::-webkit-scrollbar-thumb{background:rgba(255,255,255,.15);border-radius:3px}
 ::-webkit-scrollbar-thumb:hover{background:rgba(255,255,255,.25)}
 
-.filter-sep{width:1px;height:20px;background:var(--border);margin:0 4px}
-.filter-select{padding:6px 12px;border:1px solid var(--border);border-radius:999px;background:var(--bg-card);color:var(--text-sec);font-size:13px;outline:none;cursor:pointer}
-.filter-select:focus{border-color:var(--pri)}
+.filter-sep{width:1px;height:20px;background:var(--border);margin:0 2px}
+.filter-select{padding:5px 14px;border:1px solid var(--border);border-radius:8px;background:transparent;color:var(--text-sec);font-size:12px;font-weight:500;outline:none;cursor:pointer;transition:all .15s;-webkit-appearance:none;appearance:none;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6'%3E%3Cpath d='M0 0l5 6 5-6z' fill='%236b7280'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right 10px center;padding-right:28px}
+.filter-select:hover{border-color:var(--pri);color:var(--pri)}
+.filter-select:focus{border-color:var(--pri);color:var(--pri);background-color:rgba(99,102,241,.04)}
 .date-filter{display:flex;align-items:center;gap:10px;margin-bottom:18px;font-size:13px;color:var(--text-sec)}
-.date-filter input[type="datetime-local"]{padding:6px 10px;border:1px solid var(--border);border-radius:8px;font-size:12px;outline:none;background:var(--bg-card);color:var(--text)}
+.date-filter input[type="datetime-local"]{padding:5px 12px;border:1px solid var(--border);border-radius:8px;font-size:12px;outline:none;background:transparent;color:var(--text-sec);transition:all .15s}
 .date-filter input[type="datetime-local"]:focus{border-color:var(--pri)}
 .date-filter label{font-weight:500}
-
-.pagination{display:flex;align-items:center;justify-content:center;gap:6px;padding:28px 0;flex-wrap:wrap}
-.pagination .pg-btn{min-width:38px;height:38px;display:flex;align-items:center;justify-content:center;border:1px solid var(--border);border-radius:10px;background:var(--bg-card);color:var(--text-sec);font-size:13px;font-weight:500;cursor:pointer;transition:all .15s}
-.pagination .pg-btn:hover{border-color:var(--pri);color:var(--pri)}
-.pagination .pg-btn.active{background:var(--pri);color:#000;border-color:var(--pri)}
-.pagination .pg-btn.disabled{opacity:.4;pointer-events:none}
-.pagination .pg-info{font-size:12px;color:var(--text-sec);padding:0 12px}
+.compact-filter-row{display:flex;align-items:center;gap:8px;flex-wrap:wrap}
+.compact-date{padding:5px 12px;border:1px solid var(--border);border-radius:8px;font-size:12px;font-weight:500;outline:none;background:transparent;color:var(--text-sec);max-width:180px;transition:all .15s}
+.compact-date:hover{border-color:var(--pri);color:var(--pri)}
+.compact-date:focus{border-color:var(--pri);color:var(--pri);background:rgba(99,102,241,.04)}
+
+.pagination-row{display:flex;align-items:center;justify-content:center;gap:10px;flex-wrap:wrap;padding:16px 0 8px}
+.pagination{display:flex;align-items:center;justify-content:center;gap:4px;padding:0;flex-wrap:wrap}
+.pagination .pg-btn{min-width:32px;height:32px;display:flex;align-items:center;justify-content:center;border:1px solid transparent;border-radius:8px;background:transparent;color:var(--text-sec);font-size:12px;font-weight:500;cursor:pointer;transition:all .15s}
+.pagination .pg-btn:hover{background:rgba(99,102,241,.06);color:var(--pri);border-color:rgba(99,102,241,.15)}
+.pagination .pg-btn.active{background:var(--pri-grad);color:#fff;border-color:transparent;box-shadow:0 2px 8px rgba(99,102,241,.3)}
+.pagination .pg-btn.disabled{opacity:.3;pointer-events:none}
+.pagination .pg-info{font-size:11px;color:var(--text-muted);padding:0 8px}
 
 /* ─── Tasks 视图 ─── */
 .view-container{flex:1;min-width:0}
 .view-container>.vp{display:none;flex-direction:column}
 .view-container>.vp.show{display:flex}
-.tasks-view{flex:1;min-width:0;flex-direction:column;gap:16px}
-.tasks-header{display:flex;flex-direction:column;gap:14px}
-.tasks-stats{display:flex;gap:16px}
-.tasks-stat{display:flex;align-items:center;gap:8px;background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius);padding:12px 18px;flex:1;transition:all .2s}
+.tasks-view{flex:1;min-width:0;flex-direction:column}
+.tasks-header{display:flex;flex-direction:column;gap:0}
+.tasks-stats{display:flex;gap:10px}
+.tasks-stat{display:flex;align-items:center;gap:8px;background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius);padding:10px 16px;flex:1;transition:all .2s;position:relative;overflow:hidden}
+.tasks-stat::before{content:'';position:absolute;top:0;left:0;bottom:0;width:3px;border-radius:3px 0 0 3px}
 .tasks-stat:hover{border-color:var(--border-glow)}
-.tasks-stat-value{font-size:22px;font-weight:700;color:var(--text)}
-.tasks-stat-label{font-size:12px;color:var(--text-sec);font-weight:500}
+.tasks-stat-value{font-size:18px;font-weight:700;color:var(--text)}
+.tasks-stat-label{font-size:11px;color:var(--text-sec);font-weight:500}
 .tasks-filters{display:flex;align-items:center;gap:6px;flex-wrap:wrap}
 .tasks-list{display:flex;flex-direction:column;gap:10px}
 .task-card{background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius-lg);padding:18px 20px;cursor:pointer;transition:all .25s;position:relative;overflow:hidden}
@@ -631,7 +651,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .task-detail-meta{display:flex;flex-wrap:wrap;gap:12px;margin-bottom:20px;font-size:12px;color:var(--text-sec)}
 .task-detail-meta .meta-item{display:flex;align-items:center;gap:5px;background:var(--bg-card);border:1px solid var(--border);border-radius:8px;padding:5px 12px}
 .task-detail-summary{background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius);padding:20px;margin-bottom:20px;font-size:13px;line-height:1.7;color:var(--text);word-break:break-word}
-.task-detail-summary:empty::after{content:'Summary not yet generated (task still active)';color:var(--text-muted);font-style:italic}
+#taskDetailSummary:empty::after{content:'Summary not yet generated (task still active)';color:var(--text-muted);font-style:italic}
 .task-detail-summary .summary-section-title{font-size:14px;font-weight:700;color:var(--text);margin:14px 0 6px 0;padding-bottom:4px;border-bottom:1px solid var(--border)}
 .task-detail-summary .summary-section-title:first-child{margin-top:0}
 .task-detail-summary ul{margin:4px 0 8px 0;padding-left:20px}
@@ -670,7 +690,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 [data-theme="light"] .tasks-stat{background:#fff}
 
 /* ─── Skills ─── */
-.skills-view{flex:1;min-width:0;flex-direction:column;gap:16px}
+.skills-view{flex:1;min-width:0;flex-direction:column}
 .skill-card{background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius-lg);padding:18px 20px;cursor:pointer;transition:all .25s;position:relative;overflow:hidden}
 .skill-card:hover{border-color:var(--border-glow);background:var(--bg-card-hover);transform:translateY(-1px);box-shadow:var(--shadow)}
 .skill-card::before{content:'';position:absolute;top:0;left:0;bottom:0;width:3px;border-radius:3px 0 0 3px;background:var(--violet)}
@@ -697,6 +717,10 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .skill-card-bottom .tag{display:flex;align-items:center;gap:4px}
 .skill-card-tags{display:flex;gap:4px;flex-wrap:wrap}
 .skill-tag{font-size:10px;padding:2px 8px;border-radius:10px;background:rgba(139,92,246,.1);color:var(--violet);font-weight:500}
+.selection-toolbar{display:flex;align-items:center;gap:8px;flex-wrap:wrap}
+#memorySelectionToolbar{margin-bottom:16px}
+.item-select-box{display:inline-flex;align-items:center;justify-content:center;width:18px;height:18px;border-radius:5px;border:1px solid var(--border);background:var(--bg-card);cursor:pointer;margin-right:8px;vertical-align:middle}
+.item-select-box input{width:14px;height:14px;cursor:pointer}
 .skill-detail-desc{font-size:13px;color:var(--text-sec);line-height:1.6;margin-bottom:16px;padding:12px 16px;background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius)}
 .skill-version-item{background:var(--bg-card);border:1px solid var(--border);border-radius:var(--radius);padding:12px 16px}
 .skill-version-header{display:flex;align-items:center;gap:10px;margin-bottom:6px}
@@ -808,6 +832,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .recall-origin.local-shared{background:rgba(59,130,246,.12);color:#3b82f6}
 .recall-origin.hub-memory{background:rgba(139,92,246,.12);color:#8b5cf6}
 .recall-origin.hub-remote{background:rgba(139,92,246,.12);color:#8b5cf6}
+.recall-origin.agent-tag{background:rgba(20,184,166,.12);color:#14b8a6}
 .recall-summary-short{flex:1;color:var(--text-sec);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .recall-expand-icon{flex-shrink:0;font-size:10px;color:var(--text-muted);transition:transform .15s}
 .recall-item.expanded .recall-expand-icon{transform:rotate(90deg)}
@@ -1225,8 +1250,8 @@ input,textarea,select{font-family:inherit;font-size:inherit}
     <div class="sidebar" id="sidebar">
       <div class="stats-grid" id="statsGrid">
         <div class="stat-card pri"><div class="stat-value" id="statTotal">-</div><div class="stat-label" data-i18n="stat.memories">Memories</div></div>
-        <div class="stat-card green"><div class="stat-value" id="statSessions">-</div><div class="stat-label" data-i18n="stat.sessions">Sessions</div></div>
-        <div class="stat-card amber"><div class="stat-value" id="statEmbeddings">-</div><div class="stat-label" data-i18n="stat.embeddings">Embeddings</div></div>
+        <div class="stat-card green"><div class="stat-value" id="statTasks">-</div><div class="stat-label" data-i18n="stat.tasks">Tasks</div></div>
+        <div class="stat-card amber"><div class="stat-value" id="statSkills">-</div><div class="stat-label" data-i18n="stat.skills">Skills</div></div>
         <div class="stat-card rose"><div class="stat-value" id="statAgents">-</div><div class="stat-label" data-i18n="stat.agents">Agents</div></div>
       </div>
       <div id="sidebarSharingSection" style="display:none">
@@ -1237,8 +1262,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         </div>
       </div>
       <div id="embeddingStatus"></div>
-      <div class="session-list" id="sessionList" style="display:none"></div>
-      <button class="btn btn-sm btn-ghost" style="width:100%;margin-top:20px;justify-content:center;color:var(--text-muted);font-size:11px" onclick="clearAll()" data-i18n="sidebar.clear">\u{1F5D1} Clear All Data</button>
+      <button class="btn btn-sm btn-ghost" style="width:100%;margin:20px 0 12px;justify-content:center;color:var(--text-muted);font-size:11px" onclick="clearAll()" data-i18n="sidebar.clear">\u{1F5D1} Clear All Data</button>
     </div>
 
     <div class="view-container">
@@ -1251,14 +1275,13 @@ input,textarea,select{font-family:inherit;font-size:inherit}
           <option value="" data-i18n="filter.allagents">All agents</option>
         </select>
         <select id="memorySearchScope" class="filter-select" onchange="onMemoryScopeChange()" style="display:none">
-          <option value="local" data-i18n="scope.thisAgent">This Agent</option>
           <option value="allLocal" data-i18n="scope.thisDevice">This Device</option>
           <option value="hub" data-i18n="scope.hub">Team</option>
         </select>
       </div>
-      <div class="search-meta" id="searchMeta"></div>
-      <div class="search-meta" id="sharingSearchMeta"></div>
-      <div class="filter-bar" id="filterBar">
+      <div id="searchMeta" style="display:none"></div>
+      <div id="sharingSearchMeta" style="display:none"></div>
+      <div class="filter-bar compact-filter-row" id="filterBar" style="flex-wrap:nowrap">
         <button class="filter-chip active" data-role="" onclick="setRoleFilter(this,'')" data-i18n="filter.all">All</button>
         <button class="filter-chip" data-role="user" onclick="setRoleFilter(this,'user')">User</button>
         <button class="filter-chip" data-role="assistant" onclick="setRoleFilter(this,'assistant')">Assistant</button>
@@ -1267,42 +1290,48 @@ input,textarea,select{font-family:inherit;font-size:inherit}
           <option value="newest" data-i18n="filter.newest">Newest first</option>
           <option value="oldest" data-i18n="filter.oldest">Oldest first</option>
         </select>
-        <span class="filter-sep"></span>
-        <select id="filterSession" class="filter-select" onchange="filterSession(this.value||null)">
-          <option value="" data-i18n="filter.allsessions">All sessions</option>
-        </select>
+        <span style="flex:1"></span>
+        <button class="filter-chip" id="memorySelectAllBtn" onclick="toggleSelectAllMemories()" data-i18n="skills.selectAll">Select All</button>
+        <button class="filter-chip" id="memoryBulkDeleteBtn" onclick="deleteSelectedMemories()" style="display:none;color:#ef4444;border-color:rgba(239,68,68,.3)" data-i18n="memory.deleteSelected">Delete Selected</button>
       </div>
-      <div class="date-filter">
-        <label data-i18n="filter.from">From</label><input type="datetime-local" id="dateFrom" step="1" onchange="applyFilters()">
-        <label data-i18n="filter.to">To</label><input type="datetime-local" id="dateTo" step="1" onchange="applyFilters()">
-        <button class="btn btn-sm btn-text" onclick="clearDateFilter()" data-i18n="filter.clear">Clear</button>
+      <div class="filter-bar compact-filter-row" style="flex-wrap:nowrap;margin-bottom:12px">
+        <input type="datetime-local" id="dateFrom" step="1" onchange="applyFilters()" class="compact-date" data-i18n-ph="filter.from" placeholder="From">
+        <span style="color:var(--text-muted);font-size:12px">—</span>
+        <input type="datetime-local" id="dateTo" step="1" onchange="applyFilters()" class="compact-date" data-i18n-ph="filter.to" placeholder="To">
+        <button class="filter-chip" onclick="clearDateFilter()" data-i18n="filter.clear" style="font-size:11px;padding:4px 10px">Clear</button>
       </div>
       <div class="memory-list" id="memoryList"><div class="spinner"></div></div>
-      <div class="pagination" id="pagination"></div>
+      <div class="pagination-row">
+        <div class="pagination" id="pagination"></div>
+      </div>
     </div>
     </div>
     <div class="tasks-view vp" id="tasksView">
-      <div class="tasks-header">
-        <div class="tasks-stats">
-          <div class="tasks-stat"><span class="tasks-stat-value" id="tasksTotalCount">-</span><span class="tasks-stat-label" data-i18n="tasks.total">Total Tasks</span></div>
-          <div class="tasks-stat"><span class="tasks-stat-value" id="tasksActiveCount">-</span><span class="tasks-stat-label" data-i18n="tasks.active">Active</span></div>
-          <div class="tasks-stat"><span class="tasks-stat-value" id="tasksCompletedCount">-</span><span class="tasks-stat-label" data-i18n="tasks.completed">Completed</span></div>
-          <div class="tasks-stat"><span class="tasks-stat-value" id="tasksSkippedCount">-</span><span class="tasks-stat-label" data-i18n="tasks.status.skipped">Skipped</span></div>
-        </div>
-        <div class="tasks-filters">
-          <button class="filter-chip active" data-task-status="" onclick="setTaskStatusFilter(this,'')" data-i18n="filter.all">All</button>
-          <button class="filter-chip" data-task-status="active" onclick="setTaskStatusFilter(this,'active')" data-i18n="tasks.status.active">Active</button>
-          <button class="filter-chip" data-task-status="completed" onclick="setTaskStatusFilter(this,'completed')" data-i18n="tasks.status.completed">Completed</button>
-          <button class="filter-chip" data-task-status="skipped" onclick="setTaskStatusFilter(this,'skipped')" data-i18n="tasks.status.skipped">Skipped</button>
-          <select id="taskSearchScope" class="scope-select" onchange="onTaskScopeChange()" style="display:none">
-            <option value="local" data-i18n="scope.thisAgent">This Agent</option>
-            <option value="allLocal" data-i18n="scope.thisDevice">This Device</option>
-            <option value="hub" data-i18n="scope.hub">Team</option>
-          </select>
-        </div>
+      <div class="search-bar">
+        <span class="search-icon">\u{1F50D}</span>
+        <input type="text" id="taskSearchInput" data-i18n-ph="tasks.search.placeholder" placeholder="Search tasks..." oninput="debounceTaskSearch()">
+        <select id="taskFilterOwner" class="filter-select" onchange="onOwnerFilterChange()">
+          <option value="" data-i18n="filter.allagents">All agents</option>
+        </select>
+        <select id="taskSearchScope" class="scope-select" onchange="onTaskScopeChange()" style="display:none">
+          <option value="allLocal" data-i18n="scope.thisDevice">This Device</option>
+          <option value="hub" data-i18n="scope.hub">Team</option>
+        </select>
+      </div>
+      <div id="taskSearchMeta" style="display:none"></div>
+      <div class="filter-bar compact-filter-row" style="flex-wrap:nowrap">
+        <button class="filter-chip active" data-task-status="" onclick="setTaskStatusFilter(this,'')" data-i18n="filter.all">All</button>
+        <button class="filter-chip" data-task-status="active" onclick="setTaskStatusFilter(this,'active')" data-i18n="tasks.status.active">Active</button>
+        <button class="filter-chip" data-task-status="completed" onclick="setTaskStatusFilter(this,'completed')" data-i18n="tasks.status.completed">Completed</button>
+        <button class="filter-chip" data-task-status="skipped" onclick="setTaskStatusFilter(this,'skipped')" data-i18n="tasks.status.skipped">Skipped</button>
+        <span style="flex:1"></span>
+        <button class="filter-chip" id="taskSelectAllBtn" onclick="toggleSelectAllTasks()" data-i18n="skills.selectAll">Select All</button>
+        <button class="filter-chip" id="taskBulkDeleteBtn" onclick="deleteSelectedTasks()" style="display:none;color:#ef4444;border-color:rgba(239,68,68,.3)" data-i18n="task.deleteSelected">Delete Selected</button>
       </div>
       <div class="tasks-list" id="tasksList"><div class="spinner"></div></div>
-      <div class="pagination" id="tasksPagination"></div>
+      <div class="pagination-row">
+        <div class="pagination" id="tasksPagination"></div>
+      </div>
       <div class="task-detail-overlay" id="taskDetailOverlay" onclick="closeTaskDetail(event)">
         <div class="task-detail-panel" onclick="event.stopPropagation()">
           <div class="task-detail-header">
@@ -1336,34 +1365,33 @@ input,textarea,select{font-family:inherit;font-size:inherit}
       <div class="search-bar">
         <span class="search-icon">🔍</span>
         <input type="text" id="skillSearchInput" placeholder="Search skills..." data-i18n-ph="skills.search.placeholder" oninput="debounceSkillSearch()">
+        <select id="skillFilterOwner" class="filter-select" onchange="onOwnerFilterChange()">
+          <option value="" data-i18n="filter.allagents">All agents</option>
+        </select>
         <select id="skillSearchScope" class="scope-select" onchange="onSkillScopeChange()" style="display:none">
-          <option value="local" data-i18n="scope.thisAgent">This Agent</option>
           <option value="allLocal" data-i18n="scope.thisDevice">This Device</option>
           <option value="hub" data-i18n="scope.hub">Team</option>
         </select>
       </div>
-      <div class="search-meta" id="skillSearchMeta" style="display:none"></div>
-      <div class="tasks-header">
-        <div class="tasks-stats">
-          <div class="tasks-stat"><span class="tasks-stat-value" id="skillsTotalCount">-</span><span class="tasks-stat-label" data-i18n="skills.total">Total Skills</span></div>
-          <div class="tasks-stat" style="border-left:3px solid var(--green)"><span class="tasks-stat-value" id="skillsActiveCount">-</span><span class="tasks-stat-label" data-i18n="skills.active">Active</span></div>
-          <div class="tasks-stat" style="border-left:3px solid var(--amber)"><span class="tasks-stat-value" id="skillsDraftCount">-</span><span class="tasks-stat-label" data-i18n="skills.draft">Draft</span></div>
-          <div class="tasks-stat" style="border-left:3px solid var(--violet)"><span class="tasks-stat-value" id="skillsInstalledCount">-</span><span class="tasks-stat-label" data-i18n="skills.installed">Installed</span></div>
-          <div class="tasks-stat" style="border-left:3px solid var(--cyan)"><span class="tasks-stat-value" id="skillsPublicCount">-</span><span class="tasks-stat-label" data-i18n="skills.public">Public</span></div>
-        </div>
-        <div class="tasks-filters">
-          <button class="filter-chip active" data-skill-status="" onclick="setSkillStatusFilter(this,'')" data-i18n="filter.all">All</button>
-          <button class="filter-chip" data-skill-status="active" onclick="setSkillStatusFilter(this,'active')" data-i18n="skills.filter.active">Active</button>
-          <button class="filter-chip" data-skill-status="draft" onclick="setSkillStatusFilter(this,'draft')" data-i18n="skills.filter.draft">Draft</button>
-          <button class="filter-chip" data-skill-status="archived" onclick="setSkillStatusFilter(this,'archived')" data-i18n="skills.filter.archived">Archived</button>
-          <select id="skillVisibilityFilter" class="filter-select" onchange="loadSkills()" style="display:none">
-            <option value="" data-i18n="filter.allvisibility">All visibility</option>
-            <option value="public" data-i18n="filter.public">Public</option>
-            <option value="private" data-i18n="filter.private">Private</option>
-          </select>
-        </div>
+      <div id="skillSearchMeta" style="display:none"></div>
+      <div class="filter-bar compact-filter-row" style="flex-wrap:nowrap">
+        <button class="filter-chip active" data-skill-status="" onclick="setSkillStatusFilter(this,'')" data-i18n="filter.all">All</button>
+        <button class="filter-chip" data-skill-status="active" onclick="setSkillStatusFilter(this,'active')" data-i18n="skills.filter.active">Active</button>
+        <button class="filter-chip" data-skill-status="draft" onclick="setSkillStatusFilter(this,'draft')" data-i18n="skills.filter.draft">Draft</button>
+        <button class="filter-chip" data-skill-status="archived" onclick="setSkillStatusFilter(this,'archived')" data-i18n="skills.filter.archived">Archived</button>
+        <select id="skillVisibilityFilter" class="filter-select" onchange="loadSkills()" style="display:none">
+          <option value="" data-i18n="filter.allvisibility">All visibility</option>
+          <option value="public" data-i18n="filter.public">Public</option>
+          <option value="private" data-i18n="filter.private">Private</option>
+        </select>
+        <span style="flex:1"></span>
+        <button class="filter-chip" id="skillSelectAllBtn" onclick="toggleSelectAllSkills()" data-i18n="skills.selectAll">Select All</button>
+        <button class="filter-chip" id="skillBulkDeleteBtn" onclick="deleteSelectedSkills()" style="display:none;color:#ef4444;border-color:rgba(239,68,68,.3)" data-i18n="skills.deleteSelected">Delete Selected</button>
       </div>
       <div class="tasks-list" id="skillsList"><div class="spinner"></div></div>
+      <div class="pagination-row">
+        <div class="pagination" id="skillsPagination"></div>
+      </div>
       <div id="hubSkillsSection" style="display:none;margin-top:16px">
         <div class="section-title" style="margin-bottom:12px" data-i18n="skills.hub.title">\u{1F310} Team Skills</div>
         <div class="tasks-list" id="hubSkillsList"></div>
@@ -1791,6 +1819,11 @@ input,textarea,select{font-family:inherit;font-size:inherit}
                 <input type="number" id="cfgViewerPort" placeholder="18799">
                 <div class="field-hint" data-i18n="settings.viewerport.hint">Requires restart to take effect</div>
               </div>
+              <div class="settings-field">
+                <label data-i18n="settings.taskAutoFinalize">Task Auto-Finalize (hours)</label>
+                <input type="number" id="cfgTaskAutoFinalizeHours" placeholder="4" min="0" step="1" style="max-width:120px" onkeydown="if(['-','e','E','+'].includes(event.key))event.preventDefault()" oninput="this.value=this.value.replace(/[^0-9]/g,'')">
+                <div class="field-hint" data-i18n="settings.taskAutoFinalize.hint">Active tasks with no new messages beyond this duration will be automatically summarized and completed when the Tasks page is opened. Set to 0 to disable. Default: 4 hours.</div>
+              </div>
             </div>
             <div class="settings-card-divider"></div>
             <div class="settings-toggle">
@@ -1871,18 +1904,20 @@ input,textarea,select{font-family:inherit;font-size:inherit}
           </div>
         </div>
 
-        <div id="migrateActions" style="display:flex;gap:12px;align-items:center;flex-wrap:wrap">
+        <div id="migrateActions" style="display:flex;gap:10px 16px;align-items:center;flex-wrap:wrap">
           <button class="btn" onclick="migrateScan(true)" id="migrateScanBtn" style="background:var(--bg);border:1px solid var(--border);color:var(--text);font-weight:600;padding:7px 18px;cursor:pointer" data-i18n="migrate.scan">Scan Data Sources</button>
-          <button class="btn btn-primary" onclick="migrateStart()" id="migrateStartBtn" style="display:none" data-i18n="migrate.start">Start Import</button>
-          <span id="migrateConcurrencyRow" style="display:none;align-items:center;gap:6px">
-            <span style="font-size:11px;color:var(--text-muted)" data-i18n="migrate.concurrency.label">Concurrent agents</span>
-            <select id="migrateConcurrency" class="filter-select" style="min-width:auto;padding:3px 10px;font-size:11px">
-              <option value="1" selected>1</option>
-              <option value="2">2</option>
-              <option value="4">4</option>
-              <option value="8">8</option>
-            </select>
-          </span>
+          <div id="migrateStartConcurrencyWrap" style="display:none;align-items:center;gap:12px;flex-wrap:wrap;flex-shrink:0">
+            <button class="btn btn-primary" onclick="migrateStart()" id="migrateStartBtn" style="display:inline-flex" data-i18n="migrate.start">Start Import</button>
+            <span id="migrateConcurrencyRow" style="display:flex;align-items:center;gap:8px;flex-shrink:0;min-width:max-content">
+              <span style="font-size:11px;color:var(--text-muted);white-space:nowrap" data-i18n="migrate.concurrency.label">Concurrent agents</span>
+              <select id="migrateConcurrency" class="filter-select" style="min-width:auto;padding:3px 28px 3px 10px;font-size:11px">
+                <option value="1" selected>1</option>
+                <option value="2">2</option>
+                <option value="4">4</option>
+                <option value="8">8</option>
+              </select>
+            </span>
+          </div>
           <span id="migrateStatus" style="font-size:11px;color:var(--text-muted)"></span>
         </div>
         <div id="migrateConcurrencyWarn" style="display:none;margin-top:8px;padding:8px 12px;background:rgba(245,158,11,.06);border:1px solid rgba(245,158,11,.2);border-radius:8px;font-size:11px;color:#f59e0b;line-height:1.5">
@@ -1915,7 +1950,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
               <button class="btn btn-sm" id="ppStopBtn" onclick="ppStop()" style="display:none;background:rgba(239,68,68,.12);color:#ef4444;border:1px solid rgba(239,68,68,.3);font-size:12px;padding:5px 16px;font-weight:600" data-i18n="migrate.stop">\u25A0 Stop</button>
               <span style="display:inline-flex;align-items:center;gap:6px">
                 <span style="font-size:11px;color:var(--text-muted)" data-i18n="pp.concurrency.label">Concurrent agents</span>
-                <select id="ppConcurrency" class="filter-select" style="min-width:auto;padding:3px 10px;font-size:11px">
+                <select id="ppConcurrency" class="filter-select" style="min-width:auto;padding:3px 28px 3px 10px;font-size:11px">
                   <option value="1" selected>1</option>
                   <option value="2">2</option>
                   <option value="4">4</option>
@@ -2029,11 +2064,21 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 <div class="toast-container" id="toasts"></div>
 
 <script>
-let activeSession=null,activeRole='',editingId=null,searchTimer=null,memoryCache={},currentPage=1,totalPages=1,totalCount=0,PAGE_SIZE=40,metricsDays=30;
-let memorySearchScope='local',skillSearchScope='local',taskSearchScope='local';
+let activeSession=null,activeRole='',editingId=null,searchTimer=null,memoryCache={},currentPage=1,totalPages=1,totalCount=0,PAGE_SIZE=20,metricsDays=30;
+let memorySearchScope='allLocal',skillSearchScope='allLocal',taskSearchScope='allLocal';
 let _lastMemoriesFingerprint='',_lastTasksFingerprint='',_lastSkillsFingerprint='';
+let selectedMemoryIds=new Set(),currentMemoryIds=[];
+let selectedTaskIds=new Set(),currentTaskIds=[];
 let _embeddingWarningShown=false;
 let _currentAgentOwner='agent:main';
+try {
+  const urlParams = new URLSearchParams(window.location.search);
+  const agentId = urlParams.get('agentId');
+  if (agentId) {
+    _currentAgentOwner = 'agent:' + agentId;
+  }
+} catch(e) {}
+
 
 /* ─── i18n ─── */
 const I18N={
@@ -2083,6 +2128,9 @@ const I18N={
     'skills.search.noresult':'No matching skills found',
     'skills.load.error':'Failed to load skills',
     'skills.hub.title':'\u{1F310} Team Skills',
+    'skills.hub.empty':'No extra team skills to list here — either the hub has none yet, or every hub skill already appears in your local list above (same source skill).',
+    'skills.hub.loadError':'Failed to load team skills',
+    'skills.hub.timeout':'Team skills request timed out. Check that the Hub is running and connected.',
     'scope.local':'Local',
     'scope.thisAgent':'This Agent Only',
     'scope.thisDevice':'All Local Agents',
@@ -2098,6 +2146,8 @@ const I18N={
     'tasks.status.active':'Active',
     'tasks.status.completed':'Completed',
     'tasks.status.skipped':'Skipped',
+    'tasks.search.placeholder':'Search tasks...',
+    'tasks.search.meta':'Found {0} tasks',
     'tasks.empty':'No tasks yet. Tasks are automatically created as you converse.',
     'tasks.loading':'Loading...',
     'tasks.untitled':'Untitled Task',
@@ -2138,8 +2188,8 @@ const I18N={
     'notif.timeAgo.hour':'{n}h ago',
     'notif.timeAgo.day':'{n}d ago',
     'stat.memories':'Memories',
-    'stat.sessions':'Sessions',
-    'stat.embeddings':'Embeddings',
+    'stat.tasks':'Tasks',
+    'stat.skills':'Skills',
     'stat.agents':'Agents',
     'stat.active':'active',
     'stat.deduped':'deduped',
@@ -2179,6 +2229,7 @@ const I18N={
     'card.dedupTarget':'Target: ',
     'card.dedupReason':'Reason: ',
     'card.newSummary':'New',
+    'pagination.pageSize':'Items per page',
     'pagination.total':' total',
     'range':'Range',
     'range.days':'days',
@@ -2278,6 +2329,8 @@ const I18N={
     'settings.telemetry.hint':'Only collects tool names, latencies and version info. No memory content or personal data.',
     'settings.viewerport':'Viewer Port',
     'settings.viewerport.hint':'Requires restart to take effect',
+    'settings.taskAutoFinalize':'Task Auto-Finalize (hours)',
+    'settings.taskAutoFinalize.hint':'Active tasks with no new messages beyond this duration will be automatically summarized and completed when the Tasks page is opened. Set to 0 to disable. Default: 4 hours.',
     'settings.test':'Test Connection',
     'settings.test.loading':'Testing...',
     'settings.test.ok':'Connected',
@@ -2382,12 +2435,22 @@ const I18N={
     'skills.noversions':'No versions recorded',
     'skills.norelated':'No related tasks',
     'skills.nocontent':'No content available',
+    'skills.hub.markdownPending':'Full SKILL.md is not included in the team list response. Use “Pull to local”, then open the skill from your local list to view markdown, files, and versions.',
     'skills.nochangelog':'No changelog',
     'skills.status.active':'Active',
     'skills.status.draft':'Draft',
-    'skills.status.archived':'Archived',
+    'skills.status.archived':'Disabled',
+    'skills.action.disable':'Disable',
+    'skills.action.enable':'Enable',
+    'skills.action.delete':'Delete',
+    'skills.disable.confirm':'Are you sure you want to disable this skill? It will no longer be used in search or auto-recall, but can be re-enabled later.',
+    'skills.disable.error':'Failed to disable skill: ',
+    'skills.enable.error':'Failed to enable skill: ',
     'skills.updated':'Updated: ',
     'skills.task.prefix':'Task: ',
+    'skills.selectAll':'Select All',
+    'skills.unselectAll':'Unselect All',
+    'skills.deleteSelected':'Delete Selected',
     'tasks.chunks.label':'chunks',
     'tasks.taskid':'Task ID: ',
     'tasks.role.user':'You',
@@ -2573,7 +2636,7 @@ const I18N={
     'admin.visibility':'Visibility: ',
     'admin.session':'Session',
     'admin.content':'Content',
-    'admin.chunks':'Chunks: ',
+    'admin.chunks':'{n} memory segments',
     'admin.updated':'Updated: ',
     'admin.sharedSkills':'Shared Skills',
     'admin.noSharedSkills':'No shared skills in team.',
@@ -2728,6 +2791,10 @@ const I18N={
     'task.cancel':'Cancel',
     'task.delete.confirm':'Are you sure you want to delete this task? This cannot be undone.',
     'task.delete.error':'Failed to delete task: ',
+    'task.deleteSelected':'Delete Selected',
+    'task.delete.selected.confirm':'Delete {count} selected tasks? This action cannot be undone.',
+    'task.delete.success':'Deleted {count} tasks.',
+    'task.delete.partial':'Deleted {ok} tasks, failed {fail}.',
     'task.save.error':'Failed to save task: ',
     'task.retrySkill':'Retry Skill Generation',
     'task.retrySkill.short':'Retry Skill',
@@ -2738,7 +2805,14 @@ const I18N={
     'skill.save':'Save',
     'skill.cancel':'Cancel',
     'skill.delete.confirm':'Are you sure you want to delete this skill? This will also remove all associated files and cannot be undone.',
+    'skill.delete.selected.confirm':'Delete {count} selected skills? This action cannot be undone.',
     'skill.delete.error':'Failed to delete skill: ',
+    'skill.delete.partial':'Deleted {ok} skills, failed {fail}.',
+    'skill.delete.success':'Deleted {count} skills.',
+    'memory.deleteSelected':'Delete Selected',
+    'memory.delete.selected.confirm':'Delete {count} selected memories? This action cannot be undone.',
+    'memory.delete.success':'Deleted {count} memories.',
+    'memory.delete.partial':'Deleted {ok} memories, failed {fail}.',
     'skill.save.error':'Failed to save skill: ',
     'update.available':'New version available',
     'update.run':'Run',
@@ -2827,6 +2901,9 @@ const I18N={
     'skills.search.noresult':'未找到匹配的技能',
     'skills.load.error':'加载技能失败',
     'skills.hub.title':'\u{1F310} 团队共享技能',
+    'skills.hub.empty':'下方只列出「Hub 上有、但上方本机列表尚未包含」的技能；若 Hub 条目已与本机同源同步，则只会在上方显示，此处为空属正常。',
+    'skills.hub.loadError':'加载团队技能失败',
+    'skills.hub.timeout':'加载团队技能超时，请确认团队服务已启动且已连接。',
     'scope.local':'本地',
     'scope.thisAgent':'仅本智能体',
     'scope.thisDevice':'本机所有智能体',
@@ -2842,6 +2919,8 @@ const I18N={
     'tasks.status.active':'进行中',
     'tasks.status.completed':'已完成',
     'tasks.status.skipped':'已跳过',
+    'tasks.search.placeholder':'搜索任务...',
+    'tasks.search.meta':'找到 {0} 个任务',
     'tasks.empty':'暂无任务。任务会随着对话自动创建。',
     'tasks.loading':'加载中...',
     'tasks.untitled':'未命名任务',
@@ -2882,8 +2961,8 @@ const I18N={
     'notif.timeAgo.hour':'{n}小时前',
     'notif.timeAgo.day':'{n}天前',
     'stat.memories':'记忆',
-    'stat.sessions':'会话',
-    'stat.embeddings':'嵌入',
+    'stat.tasks':'任务',
+    'stat.skills':'技能',
     'stat.agents':'智能体',
     'stat.active':'活跃',
     'stat.deduped':'已去重',
@@ -2923,6 +3002,7 @@ const I18N={
     'card.dedupTarget':'关联: ',
     'card.dedupReason':'原因: ',
     'card.newSummary':'新摘要',
+    'pagination.pageSize':'每页数量',
     'pagination.total':' 条',
     'range':'范围',
     'range.days':'天',
@@ -3022,6 +3102,8 @@ const I18N={
     'settings.telemetry.hint':'仅收集工具名称、响应时间和版本号，不涉及任何记忆内容或个人数据。',
     'settings.viewerport':'Viewer 端口',
     'settings.viewerport.hint':'修改后需重启网关生效',
+    'settings.taskAutoFinalize':'任务自动完结（小时）',
+    'settings.taskAutoFinalize.hint':'处于进行中的任务如果超过设定时间没有新消息，打开任务页面时会自动生成总结并标记为已完成。设为 0 则关闭此功能。默认：4 小时。',
     'settings.test':'测试连接',
     'settings.test.loading':'测试中...',
     'settings.test.ok':'连接成功',
@@ -3126,12 +3208,22 @@ const I18N={
     'skills.noversions':'暂无版本记录',
     'skills.norelated':'暂无关联任务',
     'skills.nocontent':'暂无内容',
+    'skills.hub.markdownPending':'团队列表未返回完整 SKILL.md 正文。请先「拉取到本地」，再在本机技能里打开该技能即可查看正文、文件与版本。',
     'skills.nochangelog':'暂无变更记录',
     'skills.status.active':'生效中',
     'skills.status.draft':'草稿',
-    'skills.status.archived':'已归档',
+    'skills.status.archived':'已禁用',
+    'skills.action.disable':'禁用',
+    'skills.action.enable':'启用',
+    'skills.action.delete':'删除',
+    'skills.disable.confirm':'确定要禁用此技能吗？禁用后不再参与检索和自动召回，但可以随时重新启用。',
+    'skills.disable.error':'禁用技能失败：',
+    'skills.enable.error':'启用技能失败：',
     'skills.updated':'更新于：',
     'skills.task.prefix':'任务：',
+    'skills.selectAll':'全选',
+    'skills.unselectAll':'取消全选',
+    'skills.deleteSelected':'删除选中',
     'tasks.chunks.label':'条记忆',
     'tasks.taskid':'任务 ID：',
     'tasks.role.user':'你',
@@ -3317,7 +3409,7 @@ const I18N={
     'admin.visibility':'可见性：',
     'admin.session':'会话',
     'admin.content':'内容',
-    'admin.chunks':'记忆片段：',
+    'admin.chunks':'{n}段记忆片段',
     'admin.updated':'更新于：',
     'admin.sharedSkills':'共享技能',
     'admin.noSharedSkills':'团队暂无共享技能。',
@@ -3472,6 +3564,10 @@ const I18N={
     'task.cancel':'取消',
     'task.delete.confirm':'确定要删除此任务吗？此操作不可撤销。',
     'task.delete.error':'删除任务失败：',
+    'task.deleteSelected':'删除选中',
+    'task.delete.selected.confirm':'确定删除选中的 {count} 个任务吗？此操作不可撤销。',
+    'task.delete.success':'已删除 {count} 个任务。',
+    'task.delete.partial':'已删除 {ok} 个任务，失败 {fail} 个。',
     'task.save.error':'保存任务失败：',
     'task.retrySkill':'重新生成技能',
     'task.retrySkill.short':'重试技能',
@@ -3482,7 +3578,14 @@ const I18N={
     'skill.save':'保存',
     'skill.cancel':'取消',
     'skill.delete.confirm':'确定要删除此技能吗？关联的文件也会被删除，此操作不可撤销。',
+    'skill.delete.selected.confirm':'确定删除选中的 {count} 个技能吗？此操作不可撤销。',
     'skill.delete.error':'删除技能失败：',
+    'skill.delete.partial':'已删除 {ok} 个技能，失败 {fail} 个。',
+    'skill.delete.success':'已删除 {count} 个技能。',
+    'memory.deleteSelected':'删除选中',
+    'memory.delete.selected.confirm':'确定删除选中的 {count} 条记忆吗？此操作不可撤销。',
+    'memory.delete.success':'已删除 {count} 条记忆。',
+    'memory.delete.partial':'已删除 {ok} 条记忆，失败 {fail} 条。',
     'skill.save.error':'保存技能失败：',
     'update.available':'发现新版本',
     'update.run':'执行命令',
@@ -3767,9 +3870,12 @@ function switchView(view){
   }
   var sessionSection=document.getElementById('sidebarSessionSection');
   if(sessionSection){
-    if(view==='memories'){sessionSection.style.visibility='';sessionSection.style.pointerEvents='';}
+    if(view==='memories'||view==='tasks'||view==='skills'){sessionSection.style.visibility='';sessionSection.style.pointerEvents='';}
     else{sessionSection.style.visibility='hidden';sessionSection.style.pointerEvents='none';}
   }
+  if(view==='memories'||view==='tasks'||view==='skills'){
+    loadStats();
+  }
   if(view==='tasks') loadTasks();
   else if(view==='skills') loadSkills();
   else if(view==='analytics') loadMetrics();
@@ -3786,36 +3892,84 @@ function switchView(view){
 }
 
 function onMemoryScopeChange(){
-  memorySearchScope=document.getElementById('memorySearchScope')?.value||'local';
+  memorySearchScope=document.getElementById('memorySearchScope')?.value||'allLocal';
   try{localStorage.setItem('memos_memorySearchScope',memorySearchScope);}catch(e){}
   currentPage=1;
   activeSession=null;activeRole='';
   _lastMemoriesFingerprint='';
+  if(memorySearchScope==='hub') selectedMemoryIds.clear();
   var isHub=memorySearchScope==='hub';
-  var isLocal=memorySearchScope==='local';
   var ownerSel=document.getElementById('filterOwner');
   var filterBar=document.getElementById('filterBar');
   var dateFilter=document.querySelector('.date-filter');
-  if(ownerSel){ownerSel.style.display=(isHub||isLocal)?'none':'';if(isHub||isLocal)ownerSel.value='';}
+  if(ownerSel){ownerSel.style.display=isHub?'none':'';if(isHub)ownerSel.value='';}
   if(filterBar) filterBar.style.display=isHub?'none':'';
   if(dateFilter) dateFilter.style.display=isHub?'none':'';
+  updateMemorySelectionToolbar();
   if(document.getElementById('searchInput').value.trim()) doSearch(document.getElementById('searchInput').value);
   else if(isHub) { document.getElementById('sharingSearchMeta').textContent=''; loadHubMemories(); }
   else {
     document.getElementById('sharingSearchMeta').textContent='';
-    var ownerArg=isLocal?_currentAgentOwner:undefined;
+    var ownerArg=undefined;
     loadStats(ownerArg); loadMemories();
   }
 }
 
+function normalizePageSize(value,fallback){
+  const v=Number(value);
+  return v===10||v===20||v===40?v:fallback;
+}
+
+function applyPageSizeFromSelect(selectId,storageKey,fallback,onApply){
+  const el=document.getElementById(selectId);
+  const next=normalizePageSize(el?.value,fallback);
+  onApply(next);
+  try{localStorage.setItem(storageKey,String(next));}catch(e){}
+  return next;
+}
+
+function restorePageSizeSetting(storageKey,selectId,fallback,onApply){
+  let next=fallback;
+  try{
+    const raw=localStorage.getItem(storageKey);
+    next=normalizePageSize(raw||String(fallback),fallback);
+  }catch(e){}
+  onApply(next);
+  const el=document.getElementById(selectId);
+  if(el) el.value=String(next);
+  return next;
+}
+
+function onMemoryPageSizeChange(){
+  applyPageSizeFromSelect('memoryPageSize','memos_memoryPageSize',20,function(next){PAGE_SIZE=next;});
+  currentPage=1;
+  if(memorySearchScope==='hub') loadHubMemories();
+  else loadMemories();
+}
+
 function onSkillScopeChange(){
-  skillSearchScope=document.getElementById('skillSearchScope')?.value||'local';
+  skillSearchScope=document.getElementById('skillSearchScope')?.value||'allLocal';
+  skillsPage=0;
   loadSkills();
 }
 
+function onSkillsPageSizeChange(){
+  applyPageSizeFromSelect('skillsPageSize','memos_skillsPageSize',20,function(next){skillsPageSize=next;});
+  skillsPage=0;
+  loadSkills();
+}
+
+function onTasksPageSizeChange(){
+  applyPageSizeFromSelect('tasksPageSize','memos_tasksPageSize',20,function(next){tasksPageSize=next;});
+  tasksPage=0;
+  loadTasks();
+}
+
 function onTaskScopeChange(){
-  taskSearchScope=document.getElementById('taskSearchScope')?.value||'local';
+  taskSearchScope=document.getElementById('taskSearchScope')?.value||'allLocal';
+  if(taskSearchScope==='hub') selectedTaskIds.clear();
   tasksPage=0;
+  updateTaskSelectionToolbar();
   loadTasks();
 }
 
@@ -3827,6 +3981,11 @@ function _updateScopeSelectorsVisibility(hubAvailable){
     var el=document.getElementById(ids[i]);
     if(el) el.style.display=hubAvailable?'':'none';
   }
+  if(!hubAvailable){
+    if(memorySearchScope==='hub'){memorySearchScope='allLocal';try{localStorage.setItem('memos_memorySearchScope','allLocal');}catch(e){}}
+    if(taskSearchScope==='hub'){taskSearchScope='allLocal';try{localStorage.setItem('memos_taskSearchScope','allLocal');}catch(e){}}
+    if(skillSearchScope==='hub'){skillSearchScope='allLocal';try{localStorage.setItem('memos_skillSearchScope','allLocal');}catch(e){}}
+  }
 }
 async function loadSharingStatus(forcePending){
   try{
@@ -4684,7 +4843,7 @@ function renderAdminTasks(tasks){
           '<div class="admin-card-tags-left">'+
             '<span class="admin-card-tag tag-owner">\u{1F464} '+fmtOwner(tk)+'</span>'+
             (tk.status?'<span class="admin-card-tag tag-status">'+esc(tk.status)+'</span>':'')+
-            (tk.chunkCount!=null?'<span class="admin-card-tag tag-kind">\u{1F4DD} '+tk.chunkCount+' '+t('admin.chunks')+'</span>':'')+
+            (tk.chunkCount!=null?'<span class="admin-card-tag tag-kind">\u{1F4DD} '+t('admin.chunks').replace('{n}',String(tk.chunkCount))+'</span>':'')+
         '</div>'+
           '<span class="admin-card-actions" onclick="event.stopPropagation()">'+
             (window._isHubAdmin?'<button class="btn btn-sm btn-ghost" onclick="adminDeleteTask(&quot;'+escAttr(tk.id)+'&quot;,&quot;'+escAttr(tk.title||tk.id)+'&quot;)" style="color:var(--rose)">'+t('admin.remove')+'</button>':'')+
@@ -5005,7 +5164,7 @@ async function toggleAdminSkillCard(cardId,idx){
   if(files.length>0){
     var fileIcons={'skill':'\u{1F4D6}','script':'\u{2699}','reference':'\u{1F4CE}','file':'\u{1F4C4}'};
     filesHtml='<div class="admin-card-detail-section"><div class="detail-label" style="display:flex;align-items:center;justify-content:space-between">'+t('skills.files')+
-      '<button class="btn btn-sm btn-ghost" onclick="event.stopPropagation();window.open(\\x27/api/skill/'+encodeURIComponent(localSkillId)+'/download\\x27,\\x27_blank\\x27)" style="font-size:11px">\u2B07 '+t('skills.download')+'</button>'+
+      '<button class="btn btn-sm btn-ghost" onclick="event.stopPropagation();window.open(\\x27/api/skill/'+encodeURIComponent(localSkillId)+'/download\\x27,\\x27_blank\\x27)" style="font-size:11px">'+t('skills.download')+'</button>'+
       '</div><div class="skill-files-list">'+
       files.map(function(f){return '<div class="skill-file-item">'+
         '<span class="skill-file-icon">'+(fileIcons[f.type]||'\u{1F4C4}')+'</span>'+
@@ -5040,6 +5199,7 @@ function renderSharingMemorySearchResults(data,query){
   const list=document.getElementById('memoryList');
   const localHits=(data&&data.local&&Array.isArray(data.local.hits))?data.local.hits:[];
   const hubHits=(data&&data.hub&&Array.isArray(data.hub.hits))?data.hub.hits:[];
+  setPageSizeVisible('memoryPageSize',(localHits.length+hubHits.length)>0);
   document.getElementById('searchMeta').textContent='Search results for "'+query+'"';
   document.getElementById('sharingSearchMeta').textContent=t('scope.local')+' '+localHits.length+' · '+t('scope.hub')+' '+hubHits.length;
   document.getElementById('pagination').innerHTML='';
@@ -5047,11 +5207,13 @@ function renderSharingMemorySearchResults(data,query){
     '<div class="result-section">'+
       '<div class="result-section-header"><div class="result-section-title">'+t('search.localResults')+'</div><div class="result-section-sub">'+localHits.length+' hit(s)</div></div>'+
       '<div class="search-hit-list">'+(localHits.length?localHits.map(function(hit,idx){
+        var agentName='';if(hit.owner){var ap=(hit.owner||'').split(':');agentName=ap.length>=3?ap[ap.length-1]:(ap.length>=2?ap[1]:hit.owner);}
         return '<div class="search-hit-card">'+
           '<div class="summary">'+(idx+1)+'. '+esc(hit.summary||'(no summary)')+'</div>'+
           '<div class="excerpt">'+esc(hit.excerpt||'')+'</div>'+
           '<div class="search-hit-meta">'+
             '<span class="meta-chip">role: '+esc(hit.role||'unknown')+'</span>'+
+            (agentName?'<span class="meta-chip" style="background:rgba(20,184,166,.12);color:#14b8a6">'+esc(agentName)+'</span>':'')+
             (hit.score!=null?'<span class="meta-chip">score: '+Math.round(hit.score*100)+'%</span>':'')+
             (hit.taskId?'<span class="meta-chip">task: '+esc(hit.taskId)+'</span>':'')+
           '</div>'+
@@ -5061,11 +5223,13 @@ function renderSharingMemorySearchResults(data,query){
     '<div class="result-section">'+
       '<div class="result-section-header"><div class="result-section-title">'+t('search.hubResults')+'</div><div class="result-section-sub">'+hubHits.length+' hit(s)</div></div>'+
       '<div class="search-hit-list">'+(hubHits.length?hubHits.map(function(hit,idx){
+        var hubAgentName='';if(hit.sourceAgent){var hap=(hit.sourceAgent||'').split(':');hubAgentName=hap.length>=3?hap[hap.length-1]:(hap.length>=2?hap[1]:hit.sourceAgent);}
         return '<div class="hub-hit-card">'+
           '<div class="summary">'+(idx+1)+'. '+esc(hit.summary||'(no summary)')+'</div>'+
           '<div class="excerpt">'+esc(hit.excerpt||'')+'</div>'+
           '<div class="hub-hit-meta">'+
             '<span class="meta-chip">owner: '+fmtOwner(hit)+'</span>'+
+            (hubAgentName?'<span class="meta-chip" style="background:rgba(20,184,166,.12);color:#14b8a6">'+esc(hubAgentName)+'</span>':'')+
             (hit.groupName?'<span class="meta-chip">group: '+esc(hit.groupName)+'</span>':'')+
             '<span class="meta-chip">visibility: '+esc(hit.visibility||'hub')+'</span>'+
           '</div>'+
@@ -5188,7 +5352,7 @@ function openHubSkillDetailFromCache(cacheKey,idx){
   document.getElementById('skillDetailMeta').innerHTML=meta.join('');
   document.getElementById('skillDetailDesc').textContent=skill.description||'';
   document.getElementById('skillFilesList').innerHTML='';
-  document.getElementById('skillDetailContent').innerHTML=skill.content?renderSkillMarkdown(skill.content):'';
+  document.getElementById('skillDetailContent').innerHTML=skill.content?renderSkillMarkdown(skill.content):('<span style="color:var(--text-muted);font-size:13px;line-height:1.6">'+t('skills.hub.markdownPending')+'</span>');
   document.getElementById('skillVersionsList').innerHTML='';
   document.getElementById('skillRelatedTasks').innerHTML='';
   var visBtn=document.getElementById('skillVisibilityBtn');
@@ -5201,6 +5365,55 @@ function openHubSkillDetailFromCache(cacheKey,idx){
 
 function escAttr(s){return String(s||'').replace(/&/g,'&amp;').replace(/'/g,'&#39;').replace(/"/g,'&quot;').replace(/</g,'&lt;').replace(/>/g,'&gt;');}
 
+function fmtAgentName(owner){
+  if(!owner||owner==='public') return '';
+  var s=String(owner);
+  if(s.startsWith('agent:')) s=s.slice(6);
+  return s;
+}
+
+function fmtSessionDisplay(sid){
+  if(!sid) return '';
+  if(sid.startsWith('agent:')){
+    var parts=sid.split(':');
+    // agent:{agentId}:import → "📥 import"
+    if(parts.length===3 && parts[2]==='import') return '\\u{1F4E5} import';
+    // agent:{agentId}:{sessionKey} (exactly 3 segments) → show agent:{agentId} only (UI label; DB keeps full key)
+    if(parts.length===3) return 'agent:'+parts[1];
+    // agent:{agentId}:session:{sessionId} → badge shows agent:{agentId} only; full key stays in data-session-key for copy
+    if(parts.length>=4 && parts[2]==='session'){
+      return 'agent:'+parts[1];
+    }
+    // agent:{agentId}:... (5+ segments, e.g. IM: discord/slack channel peer id) → agent:{agentId} only
+    if(parts.length>=5) return 'agent:'+parts[1];
+    // agent:{agentId}:{other} → show from second part (e.g. "work:main")
+    return parts.slice(1).join(':');
+  }
+  // Legacy formats
+  if(sid.startsWith('openclaw-import-')) return '\\u{1F4E5} '+sid.slice(16);
+  if(sid.startsWith('openclaw-session-')){
+    var id=sid.slice(17);
+    return id.length>12?id.slice(0,6)+'..'+id.slice(-4):id;
+  }
+  if(sid.length>20) return sid.slice(0,8)+'..'+sid.slice(-6);
+  return sid;
+}
+
+function copySessionKeyFromEl(el){
+  var k=el&&el.getAttribute('data-session-key');
+  if(!k) return;
+  navigator.clipboard.writeText(k).then(function(){
+    toast(t('copy.done'),'success');
+  }).catch(function(){
+    toast('Copy failed','error');
+  });
+}
+
+function isImportedSession(sid){
+  if(!sid) return false;
+  return sid.startsWith('openclaw-import-')||sid.startsWith('openclaw-session-')||/^agent:[^:]+:(import|session:)/.test(sid);
+}
+
 /* ─── Unified Sharing Scope Selector ─── */
 
 function getScopeLabel(scope){
@@ -5343,9 +5556,9 @@ function openTaskScopeModal(){
   var isTeamShared=!!(task.sharingVisibility||task.hubTaskId);
   var cs=isTeamShared?'team':isLocalShared?'local':'private';
   openScopeSelectorModal('task',task.id,cs,function(s){
-    if(s==='team'){task.sharingVisibility='public';task.hubTaskId=task.hubTaskId||'shared';}
-    else if(s==='local'){task.sharingVisibility=null;task.owner='public';}
-    else{task.sharingVisibility=null;task.owner=task._origOwner||'agent:main';}
+    if(s==='team'){task.sharingVisibility='public';task.hubTaskId=true;}
+    else if(s==='local'){task.sharingVisibility=null;task.hubTaskId=false;task.owner='public';}
+    else{task.sharingVisibility=null;task.hubTaskId=false;task.owner=task._origOwner||'agent:main';}
     renderTaskShareActions(task);
     updateTaskCardBadge(task.id,s);
   });
@@ -5362,7 +5575,7 @@ async function shareCurrentTask(){
   try{
     const r=await fetch('/api/sharing/tasks/share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({taskId:currentTaskDetail.id,visibility:visibility})});
     const d=await r.json();
-    if(d.ok||d.shared){toast(t('toast.taskShared'),'success');currentTaskDetail.sharingVisibility=visibility;renderTaskShareActions(currentTaskDetail);} else {toast(d.error||t('toast.taskShareFail'),'error');}
+    if(d.ok||d.shared){toast(t('toast.taskShared'),'success');currentTaskDetail.sharingVisibility=visibility;currentTaskDetail.hubTaskId=true;renderTaskShareActions(currentTaskDetail);} else {toast(d.error||t('toast.taskShareFail'),'error');}
   }catch(e){toast(t('toast.taskShareFail')+': '+e.message,'error');}
 }
 
@@ -5371,7 +5584,7 @@ async function unshareCurrentTask(){
   try{
     const r=await fetch('/api/sharing/tasks/unshare',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({taskId:currentTaskDetail.id})});
     const d=await r.json();
-    if(d.ok||d.unshared){toast(t('toast.taskUnshared'),'success');currentTaskDetail.sharingVisibility=null;renderTaskShareActions(currentTaskDetail);} else {toast(d.error||t('toast.taskUnshareFail'),'error');}
+    if(d.ok||d.unshared){toast(t('toast.taskUnshared'),'success');currentTaskDetail.sharingVisibility=null;currentTaskDetail.hubTaskId=false;renderTaskShareActions(currentTaskDetail);} else {toast(d.error||t('toast.taskUnshareFail'),'error');}
   }catch(e){toast(t('toast.taskUnshareFail')+': '+e.message,'error');}
 }
 
@@ -5386,6 +5599,10 @@ function renderSkillShareActions(skill){
 }
 function openSkillScopeModal(){
   if(!currentSkillDetail) return;
+  if(currentSkillDetail.status!=='active'){
+    toast(t('share.scope.skillNotActive'),'warn');
+    return;
+  }
   var skill=currentSkillDetail;
   var isLocalShared=skill.visibility==='public';
   var isTeamShared=!!skill.sharingVisibility;
@@ -5459,6 +5676,7 @@ function localMemoryErrorMessage(err){
 
 function debounceSkillSearch(){
   clearTimeout(skillSearchTimer);
+  skillsPage=0;
   skillSearchTimer=setTimeout(function(){loadSkills();},300);
 }
 
@@ -5572,6 +5790,13 @@ function recallOriginBadge(origin){
   if(origin==='hub-remote') return '<span class="recall-origin hub-remote">'+t('recall.origin.hubRemote')+'</span>';
   return '';
 }
+function agentBadge(owner){
+  if(!owner) return '';
+  var parts=(owner||'').split(':');
+  var name=parts.length>=3?parts[parts.length-1]:(parts.length>=2?parts[1]:owner);
+  if(!name) return '';
+  return '<span class="recall-origin agent-tag">\u{1F916} '+escapeHtml(name)+'</span>';
+}
 
 function buildLogSummary(lg){
   let inputObj=null;
@@ -5598,8 +5823,9 @@ function buildLogSummary(lg){
           var shortText=escapeHtml(c.summary||c.content||c.original_excerpt||'');
           var fullText=escapeHtml(c.content||c.original_excerpt||c.summary||'');
           var oBadge=recallOriginBadge(c.origin);
+          var aBadge2=agentBadge(c.owner);
           html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-          html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+c.score.toFixed(2)+'</span><span class="log-msg-role '+(c.role||'user')+'">'+(c.role||'user')+'</span>'+oBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+          html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+c.score.toFixed(2)+'</span><span class="log-msg-role '+(c.role||'user')+'">'+(c.role||'user')+'</span>'+oBadge+aBadge2+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
           html+='<div class="recall-summary-full">'+fullText+'</div>';
           html+='</div>';
         });
@@ -5614,8 +5840,9 @@ function buildLogSummary(lg){
             var shortText=escapeHtml(c.summary||c.original_excerpt||'');
             var fullText=escapeHtml(c.original_excerpt||c.summary||'');
             var owner=c.ownerName?' ['+escapeHtml(c.ownerName)+']':'';
+            var haBadge2=agentBadge(c.sourceAgent||'');
             html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-            html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+c.score.toFixed(2)+'</span><span class="log-msg-role '+(c.role||'assistant')+'">'+(c.role||'assistant')+'</span><span class="recall-origin hub-remote">'+t('recall.origin.hubRemote')+'</span>'+owner+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+            html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+c.score.toFixed(2)+'</span><span class="log-msg-role '+(c.role||'assistant')+'">'+(c.role||'assistant')+'</span><span class="recall-origin hub-remote">'+t('recall.origin.hubRemote')+'</span>'+owner+haBadge2+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
             html+='<div class="recall-summary-full">'+fullText+'</div>';
             html+='</div>';
           });
@@ -5631,8 +5858,9 @@ function buildLogSummary(lg){
             var shortText=escapeHtml(f.summary||f.content||f.original_excerpt||'');
             var fullText=escapeHtml(f.content||f.original_excerpt||f.summary||'');
             var oBadge=recallOriginBadge(f.origin);
+            var faBadge2=agentBadge(f.owner);
             html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-            html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+f.score.toFixed(2)+'</span><span class="log-msg-role '+(f.role||'user')+'">'+(f.role||'user')+'</span>'+oBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+            html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+f.score.toFixed(2)+'</span><span class="log-msg-role '+(f.role||'user')+'">'+(f.role||'user')+'</span>'+oBadge+faBadge2+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
             html+='<div class="recall-summary-full">'+fullText+'</div>';
             html+='</div>';
           });
@@ -5698,8 +5926,9 @@ function buildRecallDetailHtml(rd){
       var shortText=escapeHtml(c.summary||c.content||c.original_excerpt||'');
       var fullText=escapeHtml(c.content||c.original_excerpt||c.summary||'');
       var oBadge=recallOriginBadge(c.origin);
+      var aBadge=agentBadge(c.owner);
       html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+c.score.toFixed(3)+'</span><span class="log-msg-role '+(c.role||'user')+'">'+(c.role||'user')+'</span>'+oBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+c.score.toFixed(3)+'</span><span class="log-msg-role '+(c.role||'user')+'">'+(c.role||'user')+'</span>'+oBadge+aBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
       html+='<div class="recall-summary-full">'+fullText+'</div>';
       html+='</div>';
     });
@@ -5714,8 +5943,9 @@ function buildRecallDetailHtml(rd){
       var shortText=escapeHtml(c.summary||c.original_excerpt||'');
       var fullText=escapeHtml(c.original_excerpt||c.summary||'');
       var owner=c.ownerName?' ['+escapeHtml(c.ownerName)+']':'';
+      var haBadge=agentBadge(c.sourceAgent||'');
       html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+c.score.toFixed(2)+'</span><span class="log-msg-role '+(c.role||'assistant')+'">'+(c.role||'assistant')+'</span><span class="recall-origin hub-remote">'+t('recall.origin.hubRemote')+'</span>'+owner+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+c.score.toFixed(2)+'</span><span class="log-msg-role '+(c.role||'assistant')+'">'+(c.role||'assistant')+'</span><span class="recall-origin hub-remote">'+t('recall.origin.hubRemote')+'</span>'+owner+haBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
       html+='<div class="recall-summary-full">'+fullText+'</div>';
       html+='</div>';
     });
@@ -5731,8 +5961,9 @@ function buildRecallDetailHtml(rd){
       var shortText=escapeHtml(f.summary||f.content||f.original_excerpt||'');
       var fullText=escapeHtml(f.content||f.original_excerpt||f.summary||'');
       var oBadge=recallOriginBadge(f.origin);
+      var faBadge=agentBadge(f.owner);
       html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+f.score.toFixed(3)+'</span><span class="log-msg-role '+(f.role||'user')+'">'+(f.role||'user')+'</span>'+oBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+f.score.toFixed(3)+'</span><span class="log-msg-role '+(f.role||'user')+'">'+(f.role||'user')+'</span>'+oBadge+faBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
       html+='<div class="recall-summary-full">'+fullText+'</div>';
       html+='</div>';
     });
@@ -5827,6 +6058,11 @@ function escapeHtml(s){
   return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
 }
 
+function setPageSizeVisible(selectId,visible){
+  var sel=document.getElementById(selectId);
+  if(sel&&sel.parentElement){ sel.parentElement.style.display=visible?'inline-flex':'none'; }
+}
+
 function setMetricsDays(d){
   metricsDays=d;
   document.querySelectorAll('.metrics-toolbar .range-btn').forEach(btn=>btn.classList.toggle('active',Number(btn.dataset.days)===d));
@@ -5846,40 +6082,179 @@ async function loadMetrics(){
   }catch(e){console.error('loadMetrics',e)}
 }
 
+function _st(id,v){var e=document.getElementById(id);if(e)e.textContent=v;}
 function formatNum(n){return n>=1e6?(n/1e6).toFixed(1)+'M':n>=1e3?(n/1e3).toFixed(1)+'k':String(n);}
 function dateLoc(){return curLang==='zh'?'zh-CN':'en-US';}
 
 /* ─── Tasks View Logic ─── */
 let tasksStatusFilter='';
 let tasksPage=0;
-const TASKS_PER_PAGE=20;
+let tasksPageSize=20;
 
 function setTaskStatusFilter(btn,status){
-  document.querySelectorAll('.tasks-filters .filter-chip').forEach(c=>c.classList.remove('active'));
+  document.querySelectorAll('.tasks-view .filter-bar .filter-chip[data-task-status]').forEach(c=>c.classList.remove('active'));
   btn.classList.add('active');
   tasksStatusFilter=status;
   tasksPage=0;
   loadTasks();
 }
 
+function updateTaskSelectionToolbar(){
+  var toolbar=document.getElementById('taskSelectionToolbar');
+  var selectAllBtn=document.getElementById('taskSelectAllBtn');
+  var bulkDeleteBtn=document.getElementById('taskBulkDeleteBtn');
+  var isHub=taskSearchScope==='hub';
+  var total=document.querySelectorAll('#tasksList .task-select-check').length;
+  var selected=selectedTaskIds.size;
+  if(toolbar) toolbar.style.display=isHub?'none':'flex';
+  if(selectAllBtn){
+    selectAllBtn.textContent=t(selected>0&&selected===total&&total>0?'skills.unselectAll':'skills.selectAll');
+    selectAllBtn.disabled=total===0;
+    selectAllBtn.style.display=total===0?'none':'';
+  }
+  if(bulkDeleteBtn){
+    var base=t('task.deleteSelected');
+    bulkDeleteBtn.style.display=selected>0?'':'none';
+    bulkDeleteBtn.textContent=selected>0?(base+' ('+selected+')'):base;
+  }
+}
+
+function toggleTaskSelection(taskId,checked){
+  if(checked) selectedTaskIds.add(taskId);
+  else selectedTaskIds.delete(taskId);
+  updateTaskSelectionToolbar();
+}
+
+function toggleSelectAllTasks(){
+  var total=currentTaskIds.length;
+  if(total===0) return;
+  if(selectedTaskIds.size===total){
+    selectedTaskIds.clear();
+  }else{
+    selectedTaskIds=new Set(currentTaskIds);
+  }
+  var checks=document.querySelectorAll('#tasksList .task-select-check');
+  checks.forEach(function(cb){cb.checked=selectedTaskIds.has(cb.value);});
+  updateTaskSelectionToolbar();
+}
+
+async function deleteSelectedTasks(){
+  var ids=Array.from(selectedTaskIds);
+  if(ids.length===0) return;
+  var msg=t('task.delete.selected.confirm').replace('{count}',String(ids.length));
+  if(!(await confirmModal(msg,{danger:true}))) return;
+  var ok=0;
+  var fail=0;
+  for(var i=0;i<ids.length;i++){
+    try{
+      var r=await fetch('/api/task/'+ids[i],{method:'DELETE'});
+      var d=await r.json();
+      if(!r.ok) throw new Error(d.error||'unknown');
+      ok++;
+    }catch(e){
+      fail++;
+    }
+  }
+  selectedTaskIds.clear();
+  updateTaskSelectionToolbar();
+  loadTasks();
+  if(fail>0) toast(t('task.delete.partial').replace('{ok}',String(ok)).replace('{fail}',String(fail)),'warn');
+  else toast(t('task.delete.success').replace('{count}',String(ok)),'success');
+}
+
+var taskSearchQuery='';
+var _taskSearchTimer=null;
+function debounceTaskSearch(){
+  clearTimeout(_taskSearchTimer);
+  _taskSearchTimer=setTimeout(function(){
+    taskSearchQuery=(document.getElementById('taskSearchInput')||{}).value||'';
+    tasksPage=0;
+    loadTasks();
+  },350);
+}
+
+function renderTaskCards(tasks,container){
+  currentTaskIds=tasks.map(function(task){return task.id;});
+  selectedTaskIds=new Set(Array.from(selectedTaskIds).filter(function(id){return currentTaskIds.includes(id);}));
+  if(!tasks||tasks.length===0){
+    container.innerHTML='<div style="text-align:center;padding:48px;color:var(--text-muted);font-size:14px" data-i18n="tasks.empty">'+t('tasks.empty')+'</div>';
+    updateTaskSelectionToolbar();
+    return;
+  }
+  container.innerHTML=tasks.map(function(task){
+    var timeStr=formatTime(task.startedAt);
+    var durationStr=task.endedAt?formatDuration(task.endedAt-task.startedAt):'';
+    var taskIsLocalShared=task.owner==='public';
+    var taskIsTeamShared=!!task.sharingVisibility;
+    var taskScope=taskIsTeamShared?'team':taskIsLocalShared?'local':'private';
+    var selectedAttr=selectedTaskIds.has(task.id)?' checked':'';
+    return '<div class="task-card status-'+task.status+'" onclick="openTaskDetail(\\''+task.id+'\\')">'+
+      '<div class="task-card-top">'+
+        '<div class="task-card-title"><label class="item-select-box" onclick="event.stopPropagation()"><input class="task-select-check" type="checkbox" value="'+escAttr(task.id)+'"'+selectedAttr+' onchange="event.stopPropagation();toggleTaskSelection(&quot;'+escAttr(task.id)+'&quot;,this.checked)"></label>'+esc(task.title)+'</div>'+
+        '<div class="task-card-badges">'+renderScopeBadge(taskScope)+'<span class="task-status-badge '+task.status+'">'+t('tasks.status.'+task.status)+'</span></div>'+
+      '</div>'+
+      (task.summary?'<div class="task-card-summary'+(task.status==='skipped'?' skipped-reason':'')+'">'+esc(task.summary)+'</div>':'')+
+      '<div class="task-card-bottom">'+
+        '<span class="tag"><span class="icon">\\u{1F4C5}</span> '+timeStr+'</span>'+
+        (durationStr?'<span class="tag"><span class="icon">\\u23F1</span> '+durationStr+'</span>':'')+
+        '<span class="tag"><span class="icon">\\u{1F4DD}</span> '+(task.chunkCount||0)+' '+t('tasks.chunks.label')+'</span>'+
+        '<span class="tag"><span class="icon">\\u{1F4C2}</span> '+(task.sessionKey||'')+'</span>'+
+      '</div>'+
+      '<div class="card-actions" onclick="event.stopPropagation()">'+
+        '<button class="btn btn-sm btn-ghost" onclick="openTaskDetail(\\''+task.id+'\\')">'+t('card.expand')+'</button>'+
+        (task.status==='completed'&&(!task.skillStatus||task.skillStatus==='not_generated'||task.skillStatus==='skipped')?'<button class="btn btn-sm btn-ghost" onclick="retrySkillGen(\\''+task.id+'\\')">'+t('task.retrySkill.short')+'</button>':'')+
+        (task.status==='completed'
+          ?'<button class="btn btn-sm btn-ghost" onclick="openTaskScopeModalFromList(\\''+task.id+'\\',\\''+taskScope+'\\')">\\u270F '+t('share.shareBtn')+'</button>'
+          :'<button class="btn btn-sm btn-ghost" style="opacity:0.45;cursor:not-allowed" onclick="toast(t(\\x27share.scope.taskNotCompleted\\x27),\\x27warn\\x27)">\\u270F '+t('share.shareBtn')+'</button>')+
+        '<button class="btn btn-sm btn-ghost" style="color:var(--accent)" onclick="deleteTask(\\''+task.id+'\\')">'+t('task.delete')+'</button>'+
+      '</div>'+
+    '</div>';
+  }).join('');
+  updateTaskSelectionToolbar();
+}
+
 async function loadTasks(silent){
   const scope=document.getElementById('taskSearchScope')?document.getElementById('taskSearchScope').value:taskSearchScope;
-  taskSearchScope=scope||'local';
+  taskSearchScope=scope||'allLocal';
   if(taskSearchScope==='hub'){ return loadHubTasks(); }
   const list=document.getElementById('tasksList');
   if(!silent) list.innerHTML='<div class="spinner"></div>';
   try{
-    const params=new URLSearchParams({limit:String(TASKS_PER_PAGE),offset:String(tasksPage*TASKS_PER_PAGE)});
+    var ownerSel=document.getElementById('taskFilterOwner')||document.getElementById('filterOwner');
+    var ownerVal=ownerSel?ownerSel.value:'';
+
+    if(taskSearchQuery&&taskSearchQuery.trim()){
+      var sp=new URLSearchParams({q:taskSearchQuery.trim(),limit:String(tasksPageSize)});
+      if(ownerVal) sp.set('owner',ownerVal);
+      var sr=await fetch('/api/task-search?'+sp).then(function(r){return r.json()});
+      var tasks=sr.tasks||[];
+      document.getElementById('taskSearchMeta').style.display='block';
+      document.getElementById('taskSearchMeta').textContent=t('tasks.search.meta').replace('{0}',tasks.length);
+      _st('tasksTotalCount',tasks.length);
+      _st('tasksActiveCount',tasks.filter(function(tk){return tk.status==='active'}).length);
+      _st('tasksCompletedCount',tasks.filter(function(tk){return tk.status==='completed'}).length);
+      _st('tasksSkippedCount',tasks.filter(function(tk){return tk.status==='skipped'}).length);
+      if(tasksStatusFilter) tasks=tasks.filter(function(tk){return tk.status===tasksStatusFilter});
+      renderTaskCards(tasks,list);
+      document.getElementById('tasksPagination').innerHTML='';
+      return;
+    }
+    document.getElementById('taskSearchMeta').style.display='none';
+
+    const params=new URLSearchParams({limit:String(tasksPageSize),offset:String(tasksPage*tasksPageSize)});
     if(tasksStatusFilter) params.set('status',tasksStatusFilter);
-    if(taskSearchScope==='local') params.set('owner','agent:main');
+    if(activeSession) params.set('session',activeSession);
+    if(ownerVal) params.set('owner',ownerVal);
     var baseP=new URLSearchParams();
-    if(taskSearchScope==='local') baseP.set('owner','agent:main');
+    if(activeSession) baseP.set('session',activeSession);
+    if(ownerVal) baseP.set('owner',ownerVal);
+    var baseQuery=baseP.toString();
     const [data,allD,activeD,compD,skipD]=await Promise.all([
       fetch('/api/tasks?'+params).then(r=>r.json()),
-      fetch('/api/tasks?limit=1&offset=0&'+baseP).then(r=>r.json()),
-      fetch('/api/tasks?status=active&limit=1&offset=0&'+baseP).then(r=>r.json()),
-      fetch('/api/tasks?status=completed&limit=1&offset=0&'+baseP).then(r=>r.json()),
-      fetch('/api/tasks?status=skipped&limit=1&offset=0&'+baseP).then(r=>r.json())
+      fetch('/api/tasks?limit=1&offset=0'+(baseQuery?'&'+baseQuery:'')).then(r=>r.json()),
+      fetch('/api/tasks?status=active&limit=1&offset=0'+(baseQuery?'&'+baseQuery:'')).then(r=>r.json()),
+      fetch('/api/tasks?status=completed&limit=1&offset=0'+(baseQuery?'&'+baseQuery:'')).then(r=>r.json()),
+      fetch('/api/tasks?status=skipped&limit=1&offset=0'+(baseQuery?'&'+baseQuery:'')) .then(r=>r.json())
     ]);
     if(silent){
       var fp=JSON.stringify((data.tasks||[]).map(function(tk){return tk.id+'|'+tk.status+'|'+(tk.updatedAt||tk.startedAt)}));
@@ -5889,50 +6264,24 @@ async function loadTasks(silent){
     }else{
       _lastTasksFingerprint='';
     }
-    document.getElementById('tasksTotalCount').textContent=formatNum(allD.total);
-    document.getElementById('tasksActiveCount').textContent=formatNum(activeD.total);
-    document.getElementById('tasksCompletedCount').textContent=formatNum(compD.total);
-    document.getElementById('tasksSkippedCount').textContent=formatNum(skipD.total);
+    _st('tasksTotalCount',formatNum(allD.total));
+    _st('tasksActiveCount',formatNum(activeD.total));
+    _st('tasksCompletedCount',formatNum(compD.total));
+    _st('tasksSkippedCount',formatNum(skipD.total));
+
+    renderTaskCards(data.tasks||[],list);
 
     if(!data.tasks||data.tasks.length===0){
-      list.innerHTML='<div style="text-align:center;padding:48px;color:var(--text-muted);font-size:14px" data-i18n="tasks.empty">'+t('tasks.empty')+'</div>';
       document.getElementById('tasksPagination').innerHTML='';
-      return;
+    } else {
+      renderTasksPagination(data.total);
     }
-
-    list.innerHTML=data.tasks.map(task=>{
-      const timeStr=formatTime(task.startedAt);
-      const endStr=task.endedAt?formatTime(task.endedAt):'';
-      const durationStr=task.endedAt?formatDuration(task.endedAt-task.startedAt):'';
-      var taskIsLocalShared=task.owner==='public';
-      var taskIsTeamShared=!!task.sharingVisibility;
-      var taskScope=taskIsTeamShared?'team':taskIsLocalShared?'local':'private';
-      return '<div class="task-card status-'+task.status+'" onclick="openTaskDetail(\\''+task.id+'\\')">'+
-        '<div class="task-card-top">'+
-          '<div class="task-card-title">'+esc(task.title)+'</div>'+
-          '<div class="task-card-badges">'+renderScopeBadge(taskScope)+'<span class="task-status-badge '+task.status+'">'+t('tasks.status.'+task.status)+'</span></div>'+
-        '</div>'+
-        (task.summary?'<div class="task-card-summary'+(task.status==='skipped'?' skipped-reason':'')+'">'+esc(task.summary)+'</div>':'')+
-        '<div class="task-card-bottom">'+
-          '<span class="tag"><span class="icon">\\u{1F4C5}</span> '+timeStr+'</span>'+
-          (durationStr?'<span class="tag"><span class="icon">\\u23F1</span> '+durationStr+'</span>':'')+
-          '<span class="tag"><span class="icon">\\u{1F4DD}</span> '+task.chunkCount+' '+t('tasks.chunks.label')+'</span>'+
-          '<span class="tag"><span class="icon">\\u{1F4C2}</span> '+(task.sessionKey||'').slice(0,12)+'</span>'+
-        '</div>'+
-        '<div class="card-actions" onclick="event.stopPropagation()">'+
-          '<button class="btn btn-sm btn-ghost" onclick="openTaskDetail(\\''+task.id+'\\')">'+t('card.expand')+'</button>'+
-          (task.status==='completed'&&(!task.skillStatus||task.skillStatus==='not_generated'||task.skillStatus==='skipped')?'<button class="btn btn-sm btn-ghost" onclick="retrySkillGen(\\''+task.id+'\\')">'+t('task.retrySkill.short')+'</button>':'')+
-          (task.status==='completed'
-            ?'<button class="btn btn-sm btn-ghost" onclick="openTaskScopeModalFromList(\\''+task.id+'\\',\\''+taskScope+'\\')">\\u270F '+t('share.shareBtn')+'</button>'
-            :'<button class="btn btn-sm btn-ghost" style="opacity:0.45;cursor:not-allowed" onclick="toast(t(\\x27share.scope.taskNotCompleted\\x27),\\x27warn\\x27)">\\u270F '+t('share.shareBtn')+'</button>')+
-          '<button class="btn btn-sm btn-ghost" style="color:var(--accent)" onclick="deleteTask(\\''+task.id+'\\')">'+t('task.delete')+'</button>'+
-        '</div>'+
-      '</div>';
-    }).join('');
-
-    renderTasksPagination(data.total);
   }catch(e){
     console.error('loadTasks error:',e);
+    currentTaskIds=[];
+    selectedTaskIds.clear();
+    setPageSizeVisible('tasksPageSize',false);
+    updateTaskSelectionToolbar();
     list.innerHTML='<div style="text-align:center;padding:24px;color:var(--rose)">Failed to load tasks: '+String(e)+'</div>';
   }
 }
@@ -5953,7 +6302,7 @@ function updateTaskCardBadge(taskId,newScope){
 
 function renderTasksPagination(total){
   const el=document.getElementById('tasksPagination');
-  const pages=Math.ceil(total/TASKS_PER_PAGE);
+  const pages=Math.ceil(total/tasksPageSize);
   if(pages<=1){el.innerHTML='';return;}
   let html='<button class="pg-btn'+(tasksPage===0?' disabled':'')+'" onclick="tasksPage=Math.max(0,tasksPage-1);loadTasks()">\\u2190</button>';
   const start=Math.max(0,tasksPage-2),end=Math.min(pages,tasksPage+3);
@@ -6141,6 +6490,8 @@ async function deleteTask(taskId){
     const r=await fetch('/api/task/'+taskId,{method:'DELETE'});
     const d=await r.json();
     if(!r.ok) throw new Error(d.error||'unknown');
+    selectedTaskIds.delete(taskId);
+    updateTaskSelectionToolbar();
     closeTaskDetail();
     document.getElementById('taskDetailOverlay').classList.remove('show');
     loadTasks();
@@ -6150,14 +6501,55 @@ async function deleteTask(taskId){
 
 /* ─── Skills View Logic ─── */
 let skillsStatusFilter='';
+let skillsPage=0;
+let skillsPageSize=20;
+let selectedSkillIds=new Set();
+let currentLocalSkills=[];
+let skillsFilterSignature='';
 
 function setSkillStatusFilter(btn,status){
-  document.querySelectorAll('.skills-view .tasks-filters .filter-chip').forEach(c=>c.classList.remove('active'));
+  document.querySelectorAll('.skills-view .filter-bar .filter-chip[data-skill-status]').forEach(c=>c.classList.remove('active'));
   btn.classList.add('active');
   skillsStatusFilter=status;
+  skillsPage=0;
   loadSkills();
 }
 
+function updateSkillSelectionToolbar(){
+  var selectAllBtn=document.getElementById('skillSelectAllBtn');
+  var bulkDeleteBtn=document.getElementById('skillBulkDeleteBtn');
+  var total=document.querySelectorAll('#skillsList .skill-select-check').length;
+  var selected=selectedSkillIds.size;
+  if(selectAllBtn){
+    selectAllBtn.textContent=t(selected>0&&selected===total&&total>0?'skills.unselectAll':'skills.selectAll');
+    selectAllBtn.style.display=total===0?'none':'';
+  }
+  if(bulkDeleteBtn){
+    var base=t('skills.deleteSelected');
+    bulkDeleteBtn.style.display=selected>0?'':'none';
+    bulkDeleteBtn.textContent=selected>0?(base+' ('+selected+')'):base;
+  }
+}
+
+function toggleSkillSelection(skillId,checked){
+  if(checked) selectedSkillIds.add(skillId);
+  else selectedSkillIds.delete(skillId);
+  updateSkillSelectionToolbar();
+}
+
+function toggleSelectAllSkills(){
+  var total=currentLocalSkills.length;
+  if(total===0) return;
+  if(selectedSkillIds.size===total){
+    selectedSkillIds.clear();
+  }else{
+    selectedSkillIds=new Set(currentLocalSkills.map(function(s){return s.id;}));
+  }
+  var checks=document.querySelectorAll('#skillsList .skill-select-check');
+  checks.forEach(function(cb){cb.checked=selectedSkillIds.has(cb.value);});
+  updateSkillSelectionToolbar();
+}
+
 function updateSkillCardBadge(skillId,newScope){
   var cards=document.querySelectorAll('.skill-card');
   for(var i=0;i<cards.length;i++){
@@ -6174,13 +6566,28 @@ function updateSkillCardBadge(skillId,newScope){
   }
 }
 
+function renderSkillsPagination(total){
+  const el=document.getElementById('skillsPagination');
+  if(!el) return;
+  const pages=Math.ceil(total/skillsPageSize);
+  if(pages<=1){el.innerHTML='';return;}
+  let html='<button class="pg-btn'+(skillsPage===0?' disabled':'')+'" onclick="skillsPage=Math.max(0,skillsPage-1);loadSkills()">\\u2190</button>';
+  const start=Math.max(0,skillsPage-2),end=Math.min(pages,skillsPage+3);
+  for(let i=start;i<end;i++){
+    html+='<button class="pg-btn'+(i===skillsPage?' active':'')+'" onclick="skillsPage='+i+';loadSkills()">'+(i+1)+'</button>';
+  }
+  html+='<button class="pg-btn'+(skillsPage>=pages-1?' disabled':'')+'" onclick="skillsPage=Math.min('+(pages-1)+',skillsPage+1);loadSkills()">\\u2192</button>';
+  html+='<span class="pg-info">'+total+' '+t('pagination.total')+'</span>';
+  el.innerHTML=html;
+}
+
 async function loadSkills(silent){
   const list=document.getElementById('skillsList');
   const hubList=document.getElementById('hubSkillsList');
   if(!silent) list.innerHTML='<div class="spinner"></div>';
   var hubSection=document.getElementById('hubSkillsSection');
   if(hubList){
-    if(skillSearchScope==='local'||skillSearchScope==='allLocal'){
+    if(skillSearchScope==='allLocal'){
       if(hubSection) hubSection.style.display='none';
     }else{
       if(hubSection) hubSection.style.display='block';
@@ -6190,24 +6597,37 @@ async function loadSkills(silent){
 
   const query=(document.getElementById('skillSearchInput')?.value||'').trim();
   const scope=document.getElementById('skillSearchScope') ? document.getElementById('skillSearchScope').value : skillSearchScope;
-  skillSearchScope=scope||'local';
+  skillSearchScope=scope||'allLocal';
 
   try{
     const params=new URLSearchParams();
     if(skillsStatusFilter) params.set('status',skillsStatusFilter);
+    if(activeSession) params.set('session',activeSession);
+    var skillOwnerSel=document.getElementById('skillFilterOwner')||document.getElementById('filterOwner');
+    var skillOwnerVal=skillOwnerSel?skillOwnerSel.value:'';
+    if(skillOwnerVal) params.set('owner',skillOwnerVal);
     const visFilter=document.getElementById('skillVisibilityFilter')?.value;
     if(visFilter) params.set('visibility',visFilter);
+    const filterSignature=[query,skillSearchScope,skillsStatusFilter,visFilter||'',skillOwnerVal].join('|');
+    if(!silent&&filterSignature!==skillsFilterSignature){
+      skillsPage=0;
+    }
+    skillsFilterSignature=filterSignature;
 
     const localRes=await fetch('/api/skills?'+params.toString());
     const localData=await localRes.json();
     let localSkills=Array.isArray(localData.skills)?localData.skills:[];
+    currentLocalSkills=localSkills.slice();
     if(query){
       const q=query.toLowerCase();
       localSkills=localSkills.filter(skill=>{
         const haystack=[skill.name,skill.description,skill.tags].filter(Boolean).join(' ').toLowerCase();
         return haystack.includes(q);
       });
+      currentLocalSkills=localSkills.slice();
     }
+    var localIdSet=new Set(localSkills.map(function(s){return s.id;}));
+    selectedSkillIds=new Set(Array.from(selectedSkillIds).filter(function(id){return localIdSet.has(id);}));
     if(silent){
       var fp=JSON.stringify(localSkills.map(function(s){return s.id+'|'+s.status+'|'+s.version+'|'+(s.visibility||'')}));
       if(fp===_lastSkillsFingerprint) return;
@@ -6231,9 +6651,10 @@ async function loadSkills(silent){
         const skillIsLocalShared=skill.visibility==='public';
         const skillIsTeamShared=!!skill.sharingVisibility;
         const skillScope=skillIsTeamShared?'team':skillIsLocalShared?'local':'private';
+        const selectedAttr=selectedSkillIds.has(skill.id)?' checked':'';
         return '<div class="skill-card '+installedClass+' '+statusClass+'" onclick="openSkillDetail(&quot;'+escAttr(skill.id)+'&quot;)">'+
           '<div class="skill-card-top">'+
-            '<div class="skill-card-name">🧠 '+esc(skill.name)+'</div>'+
+            '<div class="skill-card-name"><label class="item-select-box" onclick="event.stopPropagation()"><input class="skill-select-check" type="checkbox" value="'+escAttr(skill.id)+'"'+selectedAttr+' onchange="event.stopPropagation();toggleSkillSelection(&quot;'+escAttr(skill.id)+'&quot;,this.checked)"></label>🧠 '+esc(skill.name)+'</div>'+
             '<div class="skill-card-badges">'+
               qsBadge+
               '<span class="skill-badge version">v'+skill.version+'</span>'+
@@ -6252,35 +6673,48 @@ async function loadSkills(silent){
               (skill.status==='active'
                 ?'<button class="btn btn-sm btn-ghost" onclick="openSkillScopeModalFromList(&quot;'+escAttr(skill.id)+'&quot;,&quot;'+skillScope+'&quot;)">\\u270F '+t('share.shareBtn')+'</button>'
                 :'<button class="btn btn-sm btn-ghost" style="opacity:0.45;cursor:not-allowed" onclick="toast(t(\\x27share.scope.skillNotActive\\x27),\\x27warn\\x27)">\\u270F '+t('share.shareBtn')+'</button>')+
+              (skill.status==='active'
+                ?'<button class="btn btn-sm btn-ghost btn-warn" onclick="disableSkill(&quot;'+escAttr(skill.id)+'&quot;)">'+t('skills.action.disable')+'</button>'
+                :'')+
+              (skill.status==='archived'
+                ?'<button class="btn btn-sm btn-ghost btn-success" onclick="enableSkill(&quot;'+escAttr(skill.id)+'&quot;)">'+t('skills.action.enable')+'</button>'
+                :'')+
+              '<button class="btn btn-sm btn-ghost btn-danger" onclick="deleteSkill(&quot;'+escAttr(skill.id)+'&quot;)">'+t('skills.action.delete')+'</button>'+
             '</span>'+
           '</div>'+
         '</div>';
       }).join('');
     };
 
-    list.innerHTML=renderLocalCards(localSkills);
-
-    if(skillSearchScope==='local'||skillSearchScope==='allLocal'){
+    const totalLocalSkills=localSkills.length;
+    const localPages=Math.ceil(totalLocalSkills/skillsPageSize)||1;
+    if(skillsPage>=localPages) skillsPage=Math.max(0,localPages-1);
+    const startIndex=skillsPage*skillsPageSize;
+    const pageSkills=localSkills.slice(startIndex,startIndex+skillsPageSize);
+    list.innerHTML=renderLocalCards(pageSkills);
+    renderSkillsPagination(totalLocalSkills);
+    setPageSizeVisible('skillsPageSize',totalLocalSkills>0);
+    updateSkillSelectionToolbar();
+
+    if(skillSearchScope==='allLocal'){
       if(hubSection) hubSection.style.display='none';
-      document.getElementById('skillSearchMeta').textContent=query?(t('skills.search.local')+' '+localSkills.length):'';
-      document.getElementById('skillsTotalCount').textContent=formatNum(localSkills.length);
-      document.getElementById('skillsActiveCount').textContent=formatNum(localSkills.filter(s=>s.status==='active').length);
-      document.getElementById('skillsDraftCount').textContent=formatNum(localSkills.filter(s=>s.status==='draft').length);
-      document.getElementById('skillsInstalledCount').textContent=formatNum(localSkills.filter(s=>s.installed).length);
-      document.getElementById('skillsPublicCount').textContent=formatNum(localSkills.filter(s=>s.visibility==='public').length);
+      _st('skillsTotalCount',formatNum(localSkills.length));
+      _st('skillsActiveCount',formatNum(localSkills.filter(s=>s.status==='active').length));
+      _st('skillsDraftCount',formatNum(localSkills.filter(s=>s.status==='draft').length));
+      _st('skillsInstalledCount',formatNum(localSkills.filter(s=>s.installed).length));
+      _st('skillsPublicCount',formatNum(localSkills.filter(s=>s.visibility==='public').length));
       return;
     }
 
     if(!query){
       if(hubSection) hubSection.style.display='block';
       var localIds=new Set(localSkills.map(function(s){return s.id;}));
-      if(hubList){ loadHubSkills(hubList, localIds); }
-      document.getElementById('skillSearchMeta').textContent=t('skills.search.local')+' '+localSkills.length;
-      document.getElementById('skillsTotalCount').textContent=formatNum(localSkills.length);
-      document.getElementById('skillsActiveCount').textContent=formatNum(localSkills.filter(s=>s.status==='active').length);
-      document.getElementById('skillsDraftCount').textContent=formatNum(localSkills.filter(s=>s.status==='draft').length);
-      document.getElementById('skillsInstalledCount').textContent=formatNum(localSkills.filter(s=>s.installed).length);
-      document.getElementById('skillsPublicCount').textContent=formatNum(localSkills.filter(s=>s.visibility==='public').length);
+      if(hubList){ await loadHubSkills(hubList, localIds); }
+      _st('skillsTotalCount',formatNum(localSkills.length));
+      _st('skillsActiveCount',formatNum(localSkills.filter(s=>s.status==='active').length));
+      _st('skillsDraftCount',formatNum(localSkills.filter(s=>s.status==='draft').length));
+      _st('skillsInstalledCount',formatNum(localSkills.filter(s=>s.installed).length));
+      _st('skillsPublicCount',formatNum(localSkills.filter(s=>s.visibility==='public').length));
       return;
     }
 
@@ -6290,9 +6724,13 @@ async function loadSkills(silent){
     sharingParams.set('maxResults','20');
     const r=await fetch('/api/sharing/search/skills?'+sharingParams.toString());
     const data=await r.json();
-    const localHits=(data.local&&Array.isArray(data.local.hits))?data.local.hits:[];
+    const localSkillIdSet=new Set(currentLocalSkills.map(function(skill){return skill.id;}));
+    const localHitsRaw=(data.local&&Array.isArray(data.local.hits))?data.local.hits:[];
+    const localHits=localHitsRaw.filter(function(skill){return localSkillIdSet.has(skill.skillId);});
     const hubHits=(data.hub&&Array.isArray(data.hub.hits))?data.hub.hits:[];
 
+    const sp=document.getElementById('skillsPagination');
+    if(sp) sp.innerHTML='';
     list.innerHTML=localHits.length?localHits.map(function(skill){
       return '<div class="hub-skill-card" onclick="openSkillDetail(&quot;'+escAttr(skill.skillId)+'&quot;)">'+
         '<div class="summary">'+esc(skill.name)+'</div>'+
@@ -6318,14 +6756,18 @@ async function loadSkills(silent){
       }).join(''):'';
     }
 
-    document.getElementById('skillSearchMeta').textContent=t('skills.search.local')+' '+localHits.length+(hubHits.length?' · '+t('scope.hub')+' '+hubHits.length:'');
-    document.getElementById('skillsTotalCount').textContent=formatNum(localHits.length+hubHits.length);
-    document.getElementById('skillsActiveCount').textContent=formatNum(localHits.length);
-    document.getElementById('skillsDraftCount').textContent='0';
-    document.getElementById('skillsInstalledCount').textContent='-';
-    document.getElementById('skillsPublicCount').textContent=formatNum(hubHits.filter(function(s){return s.visibility==='public';}).length);
+    _st('skillsTotalCount',formatNum(localHits.length+hubHits.length));
+    _st('skillsActiveCount',formatNum(localHits.length));
+    _st('skillsDraftCount','0');
+    _st('skillsInstalledCount','-');
+    _st('skillsPublicCount',formatNum(hubHits.filter(function(s){return s.visibility==='public';}).length));
+    setPageSizeVisible('skillsPageSize',(localHits.length+hubHits.length)>0);
+    updateSkillSelectionToolbar();
   }catch(e){
     list.innerHTML='<div style="text-align:center;padding:24px;color:var(--rose)">'+t('skills.load.error')+': '+esc(String(e))+'</div>';
+    const sp=document.getElementById('skillsPagination');
+    if(sp) sp.innerHTML='';
+    setPageSizeVisible('skillsPageSize',false);
     if(hubList){
       hubList.innerHTML='<div style="text-align:center;padding:24px;color:var(--rose)">'+t('skills.load.error')+'</div>';
     }
@@ -6335,19 +6777,28 @@ async function loadSkills(silent){
 async function loadHubTasks(){
   var list=document.getElementById('tasksList');
   if(!list) return;
+  currentTaskIds=[];
+  selectedTaskIds.clear();
+  updateTaskSelectionToolbar();
   list.innerHTML='<div class="spinner"></div>';
   try{
-    var r=await fetch('/api/sharing/tasks/list?limit=40');
+    var r=await fetch('/api/sharing/tasks/list?limit='+tasksPageSize);
     var d=await r.json();
     var tasks=Array.isArray(d.tasks)?d.tasks:[];
+    if(activeSession){
+      tasks=tasks.filter(function(task){
+        return (task.sessionKey||task.session_key||'')===activeSession;
+      });
+    }
     hubTasksCache=tasks;
-    document.getElementById('tasksTotalCount').textContent=formatNum(tasks.length);
-    document.getElementById('tasksActiveCount').textContent='-';
-    document.getElementById('tasksCompletedCount').textContent='-';
-    document.getElementById('tasksSkippedCount').textContent='-';
+    _st('tasksTotalCount',formatNum(tasks.length));
+    _st('tasksActiveCount','-');
+    _st('tasksCompletedCount','-');
+    _st('tasksSkippedCount','-');
     if(!tasks.length){
       list.innerHTML='<div style="text-align:center;padding:48px;color:var(--text-muted);font-size:14px">'+t('tasks.empty')+'</div>';
       document.getElementById('tasksPagination').innerHTML='';
+      setPageSizeVisible('tasksPageSize',false);
       return;
     }
     list.innerHTML=tasks.map(function(task,idx){
@@ -6366,9 +6817,11 @@ async function loadHubTasks(){
       '</div>';
     }).join('');
     document.getElementById('tasksPagination').innerHTML='';
+    setPageSizeVisible('tasksPageSize',true);
   }catch(e){
     list.innerHTML='<div style="text-align:center;padding:48px;color:var(--text-muted);font-size:14px">'+t('tasks.empty')+'</div>';
     document.getElementById('tasksPagination').innerHTML='';
+    setPageSizeVisible('tasksPageSize',false);
   }
 }
 
@@ -6377,19 +6830,31 @@ async function loadHubSkills(hubList, localIds){
   if(!hubList) return;
   var hubSection=document.getElementById('hubSkillsSection');
   hubList.innerHTML='<div class="spinner"></div>';
+  if(hubSection) hubSection.style.display='block';
   try{
-    const r=await fetch('/api/sharing/skills/list?limit=40');
+    var ctrl=new AbortController();
+    var to=setTimeout(function(){try{ctrl.abort();}catch(x){}},25000);
+    var r;
+    try{
+      r=await fetch('/api/sharing/skills/list?limit=40',{signal:ctrl.signal});
+    }finally{
+      clearTimeout(to);
+    }
+    if(!r.ok){
+      var errBody='';
+      try{errBody=await r.text();}catch(x2){errBody=r.statusText;}
+      throw new Error(errBody||String(r.status));
+    }
     const d=await r.json();
     var allSkills=Array.isArray(d.skills)?d.skills:[];
     const skills=localIds?allSkills.filter(function(s){return !localIds.has(s.sourceSkillId);}):allSkills;
     hubSkillsCache=skills;
     if(!skills.length){
-      if(hubSection) hubSection.style.display='none';
+      hubList.innerHTML='<div style="text-align:center;padding:32px;color:var(--text-muted);font-size:14px">'+t('skills.hub.empty')+'</div>';
       return;
     }
-    if(hubSection) hubSection.style.display='block';
     hubList.innerHTML=skills.map(function(skill,idx){
-      return '<div class="hub-skill-card" onclick="openHubSkillDetailFromCache(\\\'hub\\\',' +idx+')" style="cursor:pointer">'+
+      return '<div class="hub-skill-card" onclick="openHubSkillDetailFromCache(\\x27hub\\x27,'+idx+')" style="cursor:pointer">'+
         '<div class="summary">'+esc(skill.name)+'</div>'+
         '<div class="excerpt">'+esc(skill.description||'')+'</div>'+
         '<div class="hub-skill-meta">'+
@@ -6402,8 +6867,8 @@ async function loadHubSkills(hubList, localIds){
       '</div>';
     }).join('');
   }catch(e){
-    if(hubSection) hubSection.style.display='none';
-    hubList.innerHTML='';
+    var msg=String((e&&e.name==='AbortError')?t('skills.hub.timeout'):(e&&e.message)||e);
+    hubList.innerHTML='<div style="text-align:center;padding:32px;color:var(--rose);font-size:13px">'+esc(t('skills.hub.loadError')+': '+msg)+'</div>';
   }
 }
 
@@ -6468,7 +6933,17 @@ async function openSkillDetail(skillId){
     visBtn.className='skill-vis-btn';
     visBtn.textContent='\\u270F '+t('share.shareBtn');
     visBtn.dataset.vis=detailSkillScope;
-    visBtn.onclick=function(){openSkillScopeModal();};
+    visBtn.style.opacity='';
+    visBtn.style.cursor='';
+    visBtn.style.pointerEvents='';
+    if(skill.status==='active'){
+      visBtn.onclick=function(){openSkillScopeModal();};
+    }else{
+      visBtn.style.opacity='0.45';
+      visBtn.style.cursor='not-allowed';
+      visBtn.style.pointerEvents='auto';
+      visBtn.onclick=function(e){e.stopPropagation();toast(t('share.scope.skillNotActive'),'warn');};
+    }
 
     document.getElementById('skillDetailDesc').textContent=skill.description;
     currentSkillDetail=skill;
@@ -6524,7 +6999,14 @@ async function openSkillDetail(skillId){
     }
 
     window._currentSkillData=skill;
-    document.getElementById('skillDetailActions').innerHTML='';
+    var detailActionsHtml='';
+    if(skill.status==='active'){
+      detailActionsHtml+='<button class="btn btn-sm btn-warn" onclick="disableSkill(&quot;'+escAttr(skill.id)+'&quot;)">'+t('skills.action.disable')+'</button>';
+    }else if(skill.status==='archived'){
+      detailActionsHtml+='<button class="btn btn-sm btn-success" onclick="enableSkill(&quot;'+escAttr(skill.id)+'&quot;)">'+t('skills.action.enable')+'</button>';
+    }
+    detailActionsHtml+='<button class="btn btn-sm btn-danger" onclick="deleteSkill(&quot;'+escAttr(skill.id)+'&quot;)">'+t('skills.action.delete')+'</button>';
+    document.getElementById('skillDetailActions').innerHTML=detailActionsHtml;
 
   }catch(e){
     document.getElementById('skillDetailTitle').textContent=t('skills.error');
@@ -6713,6 +7195,7 @@ async function loadConfig(){
     document.getElementById('cfgSkillApiKey').value=skSum.apiKey||'';
 
     document.getElementById('cfgViewerPort').value=cfg.viewerPort||'';
+    document.getElementById('cfgTaskAutoFinalizeHours').value=cfg.taskAutoFinalizeHours!=null?cfg.taskAutoFinalizeHours:'';
 
     const tel=cfg.telemetry||{};
     document.getElementById('cfgTelemetryEnabled').checked=tel.enabled!==false;
@@ -7017,6 +7500,8 @@ async function saveGeneralConfig(){
   const cfg={};
   const vp=document.getElementById('cfgViewerPort').value.trim();
   if(vp) cfg.viewerPort=Number(vp);
+  const tafh=document.getElementById('cfgTaskAutoFinalizeHours').value.trim();
+  cfg.taskAutoFinalizeHours=tafh!==''?Math.max(0,Number(tafh)):4;
   cfg.telemetry={enabled:document.getElementById('cfgTelemetryEnabled').checked};
 
   await doSaveConfig(cfg, saveBtn, 'generalSaved');
@@ -7106,11 +7591,60 @@ async function deleteSkill(skillId){
     const r=await fetch('/api/skill/'+skillId,{method:'DELETE'});
     const d=await r.json();
     if(!r.ok) throw new Error(d.error||'unknown');
+    selectedSkillIds.delete(skillId);
+    updateSkillSelectionToolbar();
     closeSkillDetail();
     document.getElementById('skillDetailOverlay').classList.remove('show');
     loadSkills();
   }catch(e){ alert(t('skill.delete.error')+e.message); }
 }
+async function disableSkill(skillId){
+  if(!(await confirmModal(t('skills.disable.confirm')))) return;
+  try{
+    const r=await fetch('/api/skill/'+skillId+'/disable',{method:'PUT'});
+    const d=await r.json();
+    if(!r.ok) throw new Error(d.error||'unknown');
+    toast(t('skills.action.disable')+' ✓','ok');
+    closeSkillDetail();
+    document.getElementById('skillDetailOverlay').classList.remove('show');
+    loadSkills();
+  }catch(e){ alert(t('skills.disable.error')+e.message); }
+}
+async function enableSkill(skillId){
+  try{
+    const r=await fetch('/api/skill/'+skillId+'/enable',{method:'PUT'});
+    const d=await r.json();
+    if(!r.ok) throw new Error(d.error||'unknown');
+    toast(t('skills.action.enable')+' ✓','ok');
+    closeSkillDetail();
+    document.getElementById('skillDetailOverlay').classList.remove('show');
+    loadSkills();
+  }catch(e){ alert(t('skills.enable.error')+e.message); }
+}
+
+async function deleteSelectedSkills(){
+  var ids=Array.from(selectedSkillIds);
+  if(ids.length===0) return;
+  var msg=t('skill.delete.selected.confirm').replace('{count}',String(ids.length));
+  if(!(await confirmModal(msg,{danger:true}))) return;
+  var ok=0;
+  var fail=0;
+  for(var i=0;i<ids.length;i++){
+    try{
+      var r=await fetch('/api/skill/'+ids[i],{method:'DELETE'});
+      var d=await r.json();
+      if(!r.ok) throw new Error(d.error||'unknown');
+      ok++;
+    }catch(e){
+      fail++;
+    }
+  }
+  selectedSkillIds.clear();
+  updateSkillSelectionToolbar();
+  loadSkills();
+  if(fail>0) toast(t('skill.delete.partial').replace('{ok}',String(ok)).replace('{fail}',String(fail)),'warn');
+  else toast(t('skill.delete.success').replace('{count}',String(ok)),'success');
+}
 
 
 function formatDuration(ms){
@@ -7445,7 +7979,7 @@ async function _livePollTick(){
       var _searchVal=(document.getElementById('searchInput')||{}).value||'';
       if(!_searchVal.trim()){
         if(memorySearchScope==='hub') await loadHubMemories(true);
-        else{var _pollOwner=memorySearchScope==='local'?_currentAgentOwner:undefined;await loadStats(_pollOwner);await loadMemories(null,true);}
+        else{var _pollOwner=undefined;await loadStats(_pollOwner);await loadMemories(null,true);}
       }
     }
     else if(_activeView==='tasks') await loadTasks(true);
@@ -7718,7 +8252,7 @@ function stopNotifPoll(){ }
 /* ─── Data loading ─── */
 async function loadAll(){
   await loadStats();
-  var initOwner=memorySearchScope==='local'?_currentAgentOwner:undefined;
+  var initOwner=undefined;
   if(initOwner) await loadStats(initOwner);
   await Promise.all([loadMemories(),loadSharingStatus(false)]);
   checkMigrateStatus();
@@ -7738,21 +8272,23 @@ async function loadStats(ownerFilter){
     d=await r.json();
   }catch(e){ d={}; }
   if(!d||typeof d!=='object') d={};
-  if(d.currentAgentOwner) _currentAgentOwner=d.currentAgentOwner;
+  if(d.currentAgentOwner && !new URLSearchParams(window.location.search).get('agentId')) _currentAgentOwner=d.currentAgentOwner;
   const tm=d.totalMemories||0;
   const dedupB=d.dedupBreakdown||{};
   const activeCount=dedupB.active||tm;
   const inactiveCount=(dedupB.duplicate||0)+(dedupB.merged||0);
   var agentCount=(d.owners&&d.owners.length)?d.owners.length:1;
-  var sfp=tm+':'+(d.totalSessions||0)+':'+(d.totalEmbeddings||0)+':'+agentCount+':'+(d.embeddingProvider||'none')+':'+(ownerFilter||'');
+  var tvc=(d.taskSessions||[]).length;
+  var svc=(d.skillSessions||[]).length;
+  var sfp=tm+':'+(d.totalSessions||0)+':'+(d.totalEmbeddings||0)+':'+agentCount+':'+(d.embeddingProvider||'none')+':'+(ownerFilter||'')+':'+(_activeView||'memories')+':'+tvc+':'+svc;
   if(sfp===_lastStatsFp) return;
   _lastStatsFp=sfp;
   document.getElementById('statTotal').textContent=tm;
   if(inactiveCount>0){
     document.getElementById('statTotal').title=activeCount+' '+t('stat.active')+', '+inactiveCount+' '+t('stat.deduped');
   }
-  document.getElementById('statSessions').textContent=d.totalSessions||0;
-  document.getElementById('statEmbeddings').textContent=d.totalEmbeddings||0;
+  document.getElementById('statTasks').textContent=d.totalTasks||0;
+  document.getElementById('statSkills').textContent=d.totalSkills||0;
   document.getElementById('statAgents').textContent=agentCount;
 
   const provEl=document.getElementById('embeddingStatus');
@@ -7776,45 +8312,67 @@ async function loadStats(ownerFilter){
     }).catch(()=>{});
   }
 
-  const sl=document.getElementById('sessionList');
-  sl.innerHTML='<div class="session-item'+(activeSession===null?' active':'')+'" onclick="filterSession(null)"><span>'+t('sidebar.allsessions')+'</span><span class="count">'+tm+'</span></div>';
-  (d.sessions||[]).forEach(s=>{
-    const isActive=activeSession===s.session_key;
-    const name=s.session_key.length>20?s.session_key.slice(0,8)+'...'+s.session_key.slice(-8):s.session_key;
-    sl.innerHTML+='<div class="session-item'+(isActive?' active':'')+'" onclick="filterSession(\\''+s.session_key.replace(/'/g,"\\\\'")+'\\')"><span title="'+s.session_key+'">'+name+'</span><span class="count">'+s.count+'</span></div>';
-  });
+  const memorySessions=d.sessions||[];
+  const taskSessions=d.taskSessions||[];
+  const skillSessions=d.skillSessions||[];
+  const sessionMap={memories:memorySessions,tasks:taskSessions,skills:skillSessions};
+  function getSessionsForView(view){
+    return sessionMap[view]||memorySessions;
+  }
+  function countBadgeHtml(cnt){
+    return cnt&&cnt>0?'<span class="count">'+cnt+'</span>':'';
+  }
+
+  const sidebarSessions=getSessionsForView(_activeView);
 
-  const fSel=document.getElementById('filterSession');
-  if(fSel){
+  [['filterSession','memories'],['taskFilterSession','tasks'],['skillFilterSession','skills']].forEach(function(pair){
+    var selId=pair[0];
+    var viewKey=pair[1];
+    var viewSessions=getSessionsForView(viewKey);
+    const fSel=document.getElementById(selId);
+    if(!fSel) return;
     const curVal=activeSession||'';
-    var sessionCount=(d.sessions||[]).length;
+    var sessionCount=viewSessions.length;
+    fSel.style.display=sessionCount>0?'':'none';
     fSel.innerHTML='<option value="">'+t('filter.allsessions')+' ('+sessionCount+')</option>';
-    (d.sessions||[]).forEach(s=>{
+    viewSessions.forEach(s=>{
       const sName=s.session_key.length>30?s.session_key.slice(0,12)+'...'+s.session_key.slice(-10):s.session_key;
-      fSel.innerHTML+='<option value="'+s.session_key.replace(/"/g,'&quot;')+'"'+(s.session_key===curVal?' selected':'')+'>'+sName+' ('+s.count+')</option>';
+      const countLabel=(s.count&&s.count>0)?' ('+s.count+')':'';
+      fSel.innerHTML+='<option value="'+s.session_key.replace(/"/g,'&quot;')+'"'+(s.session_key===curVal?' selected':'')+'>'+sName+countLabel+'</option>';
     });
-  }
+  });
 
-  const ownerSel=document.getElementById('filterOwner');
-  if(ownerSel && d.owners && d.owners.length>0){
-    const curVal=ownerSel.value;
+  if(d.owners && d.owners.length>0){
     var agents=d.owners.filter(function(o){return o && o.indexOf('agent:')===0;});
-    ownerSel.innerHTML='<option value="">'+t('filter.allagents')+'</option>';
-    agents.forEach(function(o){
-      var label=o.replace('agent:','');
-      ownerSel.innerHTML+='<option value="'+o+'"'+(o===curVal?' selected':'')+'>'+label+'</option>';
+    ['filterOwner','taskFilterOwner','skillFilterOwner'].forEach(function(selId){
+      var sel=document.getElementById(selId);
+      if(!sel) return;
+      var curVal=sel.value;
+      sel.innerHTML='<option value="">'+t('filter.allagents')+'</option>';
+      agents.forEach(function(o){
+        var label=o.replace('agent:','');
+        sel.innerHTML+='<option value="'+o+'"'+(o===curVal?' selected':'')+'>'+label+'</option>';
+      });
+      sel.style.display='';
     });
-    if(agents.length<=1) ownerSel.style.display='none';
-    else ownerSel.style.display='';
   }
 }
 
 function onOwnerFilterChange(){
-  var owner=document.getElementById('filterOwner').value;
+  var src=event&&event.target?event.target:document.getElementById('filterOwner');
+  var owner=src.value;
+  ['filterOwner','taskFilterOwner','skillFilterOwner'].forEach(function(id){
+    var el=document.getElementById(id);
+    if(el&&el!==src) el.value=owner;
+  });
   activeSession=null;
   currentPage=1;
+  taskSearchQuery='';
+  var tsi=document.getElementById('taskSearchInput');if(tsi)tsi.value='';
   refreshSessionDropdown(owner);
   applyFilters();
+  loadTasks();
+  loadSkills();
 }
 
 async function refreshSessionDropdown(ownerFilter){
@@ -7845,12 +8403,13 @@ function getFilterParams(){
   if(dt) p.set('dateTo',dt);
   const sort=document.getElementById('filterSort').value;
   if(sort==='oldest') p.set('sort','oldest');
-  const scope=memorySearchScope||'local';
-  if(scope==='local'){
-    p.set('owner',_currentAgentOwner);
-  }else if(scope==='allLocal'){
-  const owner=document.getElementById('filterOwner').value;
-  if(owner) p.set('owner',owner);
+  const scope=memorySearchScope||'allLocal';
+  if(scope==='allLocal'){
+    const owner=document.getElementById('filterOwner').value;
+    if(owner) {
+      p.set('owner',owner);
+      _currentAgentOwner = owner;
+    }
   }
   return p;
 }
@@ -7911,6 +8470,8 @@ async function loadMemories(page,silent){
 
 async function loadHubMemories(silent){
   const list=document.getElementById('memoryList');
+  selectedMemoryIds.clear();
+  updateMemorySelectionToolbar();
   if(!silent) list.innerHTML='<div class="spinner"></div>';
   try{
     const r=await fetch('/api/sharing/memories/list?limit='+PAGE_SIZE);
@@ -7947,7 +8508,7 @@ async function doSearch(query){
     return;
   }
   currentPage=1;
-  var scope=document.getElementById('memorySearchScope')?.value||memorySearchScope||'local';
+  var scope=document.getElementById('memorySearchScope')?.value||memorySearchScope||'allLocal';
   var list=document.getElementById('memoryList');
   list.innerHTML='<div class="spinner"></div>';
   if(scope==='hub'){
@@ -7999,12 +8560,22 @@ function debounceSearch(){
 function filterSession(key){
   activeSession=key;
   currentPage=1;
-  var fSel=document.getElementById('filterSession');
-  if(fSel) fSel.value=key||'';
-  document.querySelectorAll('#sessionList .session-item').forEach(function(el,i){
-    if(i===0) el.classList.toggle('active',!key);
-    else el.classList.toggle('active',el.querySelector('span')?.title===key);
+  tasksPage=0;
+  skillsPage=0;
+  ['filterSession','taskFilterSession','skillFilterSession'].forEach(function(selId){
+    var fSel=document.getElementById(selId);
+    if(fSel) fSel.value=key||'';
   });
+  if(_activeView==='tasks'){
+    loadStats();
+    loadTasks();
+    return;
+  }
+  if(_activeView==='skills'){
+    loadStats();
+    loadSkills();
+    return;
+  }
   loadAll();
 }
 
@@ -8031,14 +8602,88 @@ function clearDateFilter(){
   applyFilters();
 }
 
+function updateMemorySelectionToolbar(){
+  var toolbar=document.getElementById('memorySelectionToolbar');
+  var selectAllBtn=document.getElementById('memorySelectAllBtn');
+  var bulkDeleteBtn=document.getElementById('memoryBulkDeleteBtn');
+  var isHub=memorySearchScope==='hub';
+  var total=document.querySelectorAll('#memoryList .memory-select-check').length;
+  var selected=selectedMemoryIds.size;
+  if(toolbar) toolbar.style.display=isHub?'none':'flex';
+  if(selectAllBtn){
+    selectAllBtn.textContent=t(selected>0&&selected===total&&total>0?'skills.unselectAll':'skills.selectAll');
+    selectAllBtn.disabled=total===0;
+    selectAllBtn.style.display=total===0?'none':'';
+  }
+  if(bulkDeleteBtn){
+    var base=t('memory.deleteSelected');
+    bulkDeleteBtn.style.display=selected>0?'':'none';
+    bulkDeleteBtn.textContent=selected>0?(base+' ('+selected+')'):base;
+  }
+}
+
+function toggleMemorySelection(memoryId,checked){
+  if(checked) selectedMemoryIds.add(memoryId);
+  else selectedMemoryIds.delete(memoryId);
+  updateMemorySelectionToolbar();
+}
+
+function toggleSelectAllMemories(){
+  var total=currentMemoryIds.length;
+  if(total===0) return;
+  if(selectedMemoryIds.size===total){
+    selectedMemoryIds.clear();
+  }else{
+    selectedMemoryIds=new Set(currentMemoryIds);
+  }
+  var checks=document.querySelectorAll('#memoryList .memory-select-check');
+  checks.forEach(function(cb){cb.checked=selectedMemoryIds.has(cb.value);});
+  updateMemorySelectionToolbar();
+}
+
+async function deleteSelectedMemories(){
+  var ids=Array.from(selectedMemoryIds);
+  if(ids.length===0) return;
+  var msg=t('memory.delete.selected.confirm').replace('{count}',String(ids.length));
+  if(!(await confirmModal(msg,{danger:true}))) return;
+  var ok=0;
+  var fail=0;
+  for(var i=0;i<ids.length;i++){
+    try{
+      var r=await fetch('/api/memory/'+ids[i],{method:'DELETE'});
+      var d=await r.json();
+      if(!d.ok) throw new Error(d.error||'unknown');
+      ok++;
+    }catch(e){
+      fail++;
+    }
+  }
+  selectedMemoryIds.clear();
+  updateMemorySelectionToolbar();
+  if(document.getElementById('searchInput').value.trim()){
+    doSearch(document.getElementById('searchInput').value);
+  }else if(memorySearchScope==='hub'){
+    loadHubMemories();
+  }else{
+    loadMemories();
+  }
+  if(fail>0) toast(t('memory.delete.partial').replace('{ok}',String(ok)).replace('{fail}',String(fail)),'warn');
+  else toast(t('memory.delete.success').replace('{count}',String(ok)),'success');
+}
+
 /* ─── Rendering ─── */
 function renderMemories(items){
   const list=document.getElementById('memoryList');
+  setPageSizeVisible('memoryPageSize',items.length>0);
   if(!items.length){
     list.innerHTML='<div class="empty"><div class="icon">\\u{1F4ED}</div><p>'+t('empty.text')+'</p></div>';
+    currentMemoryIds=[];
+    updateMemorySelectionToolbar();
     return;
   }
   items.forEach(m=>{memoryCache[m.id]=m});
+  currentMemoryIds=items.map(function(m){return m.id;});
+  selectedMemoryIds=new Set(Array.from(selectedMemoryIds).filter(function(id){return currentMemoryIds.includes(id);}));
   list.innerHTML=items.map(m=>{
     const time=m.created_at?new Date(typeof m.created_at==='number'?m.created_at:m.created_at).toLocaleString(dateLoc()):'';
     const role=m.role||'user';
@@ -8048,7 +8693,7 @@ function renderMemories(items){
     const id=m.id;
     const vscore=m._vscore?'<span class="vscore-badge">'+Math.round(m._vscore*100)+'%</span>':'';
     const sid=m.session_key||'';
-    const sidShort=sid.length>18?sid.slice(0,6)+'..'+sid.slice(-6):sid;
+    const sidShort=fmtSessionDisplay(sid);
     const mc=m.merge_count||0;
     const cardTitle=esc(rawSummary||rawContent||'');
     const mergeBadge=mc>0?'<span class="merge-badge">\\u{1F504} '+t('card.evolved')+' '+mc+t('card.times')+'</span>':'';
@@ -8056,7 +8701,7 @@ function renderMemories(items){
     const ds=m.dedup_status||'active';
     const isInactive=ds==='merged'||ds==='duplicate';
     const dedupBadge=ds==='duplicate'?'<span class="dedup-badge duplicate">'+t('card.dedupDuplicate')+'</span>':ds==='merged'?'<span class="dedup-badge merged">'+t('card.dedupMerged')+'</span>':'';
-    const isImported=sid.startsWith('openclaw-import-')||sid.startsWith('openclaw-session-');
+    const isImported=isImportedSession(sid);
     const importBadge=isImported?'<span class="import-badge">\u{1F990} '+t('card.imported')+'</span>':'';
     const ownerVal=m.owner||'agent:main';
     const isPublicMem=ownerVal==='public';
@@ -8065,6 +8710,8 @@ function renderMemories(items){
     const isHubScope=memorySearchScope==='hub';
     const memScope=memShared?'team':isPublicMem?'local':'private';
     const memScopeBadge=isHubScope?renderScopeBadge('team'):renderScopeBadge(memScope);
+    const selectedAttr=selectedMemoryIds.has(id)?' checked':'';
+    const selectBoxHtml=isHubScope?'':'<label class="item-select-box" onclick="event.stopPropagation()"><input class="memory-select-check" type="checkbox" value="'+escAttr(id)+'"'+selectedAttr+' onchange="event.stopPropagation();toggleMemorySelection(&quot;'+escAttr(id)+'&quot;,this.checked)"></label>';
     let dedupInfo='';
     if(ds==='duplicate'||ds==='merged'){
       const reason=m.dedup_reason?'<span style="font-size:11px;color:var(--text-muted)">'+t('card.dedupReason')+esc(m.dedup_reason)+'</span>':'';
@@ -8088,9 +8735,11 @@ function renderMemories(items){
         }
       }catch(e){}
     }
+    var ownerName=fmtAgentName(m.owner);
+    var ownerBadge=ownerName?'<span class="owner-tag" title="'+esc(m.owner||'')+'">\\u{1F916} '+esc(ownerName)+'</span>':'';
     return '<div class="memory-card'+(isInactive?' dedup-inactive':'')+'">'+
-      '<div class="card-header"><div class="meta"><span class="role-tag '+role+'">'+role+'</span>'+memScopeBadge+importBadge+dedupBadge+mergeBadge+'</div><span class="card-time"><span class="session-tag" title="'+esc(sid)+'">'+esc(sidShort)+'</span> '+time+updatedAt+'</span></div>'+
-      '<div class="card-summary">'+cardTitle+'</div>'+
+      '<div class="card-header"><div class="meta"><span class="role-tag '+role+'">'+role+'</span>'+ownerBadge+memScopeBadge+importBadge+dedupBadge+mergeBadge+'</div><span class="card-time"><span class="session-tag" data-session-key="'+escAttr(sid)+'" onclick="event.stopPropagation();copySessionKeyFromEl(this)" title="'+esc(sidShort+(sid?' — '+t('copy.hint'):''))+'">'+esc(sidShort)+'</span> '+time+updatedAt+'</span></div>'+
+      '<div class="card-summary">'+selectBoxHtml+cardTitle+'</div>'+
       (function(){
         if(mc<=0) return '';
         var mergeHtml='<div class="card-merged-info">';
@@ -8120,6 +8769,7 @@ function renderMemories(items){
         vscore+
       '</div></div>';
   }).join('');
+  updateMemorySelectionToolbar();
 }
 
 function updateMemoryCardBadge(chunkId,newScope){
@@ -8228,7 +8878,8 @@ async function showMemoryModal(chunkId){
       h+='<div class="mm-section"><div class="mm-section-label">'+t('admin.content')+'</div><pre class="mm-content">'+esc(m.content)+'</pre></div>';
     }
     h+='<div class="mm-meta">';
-    if(m.session_key) h+='<div class="mm-meta-chip"><strong>'+t('admin.session')+'</strong><span>'+esc(m.session_key.slice(0,12))+'</span></div>';
+    if(m.owner) h+='<div class="mm-meta-chip"><strong>'+t('admin.owner')+'</strong><span>\\u{1F916} '+esc(m.owner)+'</span></div>';
+    if(m.session_key) h+='<div class="mm-meta-chip"><strong>'+t('admin.session')+'</strong><span>'+esc(m.session_key)+'</span></div>';
     h+='<div class="mm-meta-chip"><strong>'+t('memory.detail.created')+'</strong><span>'+fmtModalDate(m.created_at)+'</span></div>';
     if(m.updated_at) h+='<div class="mm-meta-chip"><strong>'+t('memory.detail.updated')+'</strong><span>'+fmtModalDate(m.updated_at)+'</span></div>';
     if(m.kind) h+='<div class="mm-meta-chip"><strong>'+t('admin.kind')+'</strong><span>'+esc(m.kind)+'</span></div>';
@@ -8322,7 +8973,18 @@ async function deleteMemory(id){
   if(!(await confirmModal(t('confirm.delete'),{danger:true})))return;
   const r=await fetch('/api/memory/'+id,{method:'DELETE'});
   const d=await r.json();
-  if(d.ok){toast(t('toast.deleted'),'success');loadAll();}
+  if(d.ok){
+    selectedMemoryIds.delete(id);
+    updateMemorySelectionToolbar();
+    toast(t('toast.deleted'),'success');
+    if(document.getElementById('searchInput').value.trim()){
+      doSearch(document.getElementById('searchInput').value);
+    }else if(memorySearchScope==='hub'){
+      loadHubMemories();
+    }else{
+      loadMemories();
+    }
+  }
   else{toast(t('toast.delfail'),'error')}
 }
 
@@ -8362,7 +9024,13 @@ async function clearAll(){
     const r=await fetch('/api/memories',{method:'DELETE'});
     if(r.status===401){toast(t('settings.session.expired'),'error');return;}
     const d=await r.json();
-    if(d.ok){toast(t('toast.cleared'),'success');loadAll();}
+    if(d.ok){
+      toast(t('toast.cleared'),'success');
+      selectedMemoryIds.clear();selectedTaskIds.clear();selectedSkillIds.clear();
+      _lastMemoriesFingerprint='';_lastTasksFingerprint='';_lastSkillsFingerprint='';_lastStatsFp='';
+      await loadStats();
+      await Promise.all([loadMemories(),loadTasks(),loadSkills(),loadSharingStatus(false)]);
+    }
     else{toast(t('toast.clearfail'),'error')}
   }catch(e){toast('Error: '+e.message,'error')}
 }
@@ -8388,7 +9056,7 @@ async function migrateScan(showToast){
   const btn=document.getElementById('migrateScanBtn');
   btn.disabled=true;
   btn.textContent=t('migrate.scanning');
-  document.getElementById('migrateStartBtn').style.display='none';
+  document.getElementById('migrateStartConcurrencyWrap').style.display='none';
   document.getElementById('migrateScanResult').style.display='none';
   document.getElementById('migrateConfigWarn').style.display='none';
   document.getElementById('migrateProgress').style.display='none';
@@ -8421,8 +9089,7 @@ async function migrateScan(showToast){
     const remaining=Math.max(0,(d.totalItems||0)-imported);
 
     if(d.totalItems>0 && d.configReady){
-      document.getElementById('migrateStartBtn').style.display='inline-flex';
-      document.getElementById('migrateConcurrencyRow').style.display='inline-flex';
+      document.getElementById('migrateStartConcurrencyWrap').style.display='flex';
       if(d.hasImportedData){
         document.getElementById('migrateStartBtn').textContent=t('migrate.resume');
       }else{
@@ -8475,11 +9142,10 @@ async function migrateStart(){
 
   window._migrateRunning=true;
   _migrateStatusChecked=true;
-  document.getElementById('migrateStartBtn').style.display='none';
+  document.getElementById('migrateStartConcurrencyWrap').style.display='none';
   document.getElementById('migrateScanBtn').disabled=true;
   var hintEl=document.getElementById('migrateImportedHint');
   if(hintEl) hintEl.style.display='none';
-  document.getElementById('migrateConcurrencyRow').style.display='none';
   document.getElementById('migrateConcurrencyWarn').style.display='none';
   document.getElementById('migrateProgress').style.display='block';
   document.getElementById('migrateLiveLog').innerHTML='';
@@ -8564,7 +9230,7 @@ async function checkMigrateStatus(){
       const progEl=document.getElementById('migrateProgress');
       if(!progEl)return;
       progEl.style.display='block';
-      document.getElementById('migrateStartBtn').style.display='none';
+      document.getElementById('migrateStartConcurrencyWrap').style.display='none';
       document.getElementById('migrateScanBtn').disabled=true;
       document.getElementById('migrateStopBtn').disabled=false;
       const pct=s.total>0?Math.round((s.processed/s.total)*100):0;
@@ -8684,7 +9350,7 @@ function onMigrateDone(wasStopped,skipReload){
   document.getElementById('migrateStopBtn').style.display='none';
   if(wasStopped){
     document.getElementById('migrateBar').style.background='linear-gradient(90deg,#f59e0b,#fbbf24)';
-    document.getElementById('migrateStartBtn').style.display='inline-flex';
+    document.getElementById('migrateStartConcurrencyWrap').style.display='flex';
     document.getElementById('migrateStartBtn').textContent=t('migrate.resume');
     document.getElementById('migratePhaseLabel').textContent=t('migrate.phase.stopped');
   }else{
@@ -9076,7 +9742,10 @@ function doUpdateInstall(packageSpec,btnEl,statusEl,targetVersion){
       btnEl.disabled=false;
     });
 }
+var _updateChecked=false;
 async function checkForUpdate(){
+  if(_updateChecked) return;
+  _updateChecked=true;
   try{
     const r=await fetch('/api/update-check?_t='+Date.now(),{cache:'no-store'});
     if(!r.ok)return;
@@ -9126,12 +9795,16 @@ async function checkForUpdate(){
 /* ─── Init ─── */
 try{
   var savedScope=localStorage.getItem('memos_memorySearchScope');
-  if(savedScope&&(savedScope==='local'||savedScope==='allLocal'||savedScope==='hub')){
+  if(savedScope==='local') savedScope='allLocal';
+  if(savedScope&&(savedScope==='allLocal'||savedScope==='hub')){
     memorySearchScope=savedScope;
     var scopeEl=document.getElementById('memorySearchScope');
     if(scopeEl) scopeEl.value=savedScope;
   }
 }catch(e){}
+restorePageSizeSetting('memos_memoryPageSize','memoryPageSize',20,function(next){PAGE_SIZE=next;});
+restorePageSizeSetting('memos_skillsPageSize','skillsPageSize',20,function(next){skillsPageSize=next;});
+restorePageSizeSetting('memos_tasksPageSize','tasksPageSize',20,function(next){tasksPageSize=next;});
 document.getElementById('modalOverlay').addEventListener('click',e=>{if(e.target.id==='modalOverlay')closeModal()});
 document.getElementById('searchInput').addEventListener('keydown',e=>{if(e.key==='Escape'){e.target.value='';currentPage=1;if(memorySearchScope==='hub')loadHubMemories();else loadMemories();}});
 applyI18n();
diff --git a/apps/memos-local-openclaw/src/viewer/server.ts b/apps/memos-local-openclaw/src/viewer/server.ts
index 54457c215..852f3eda0 100644
--- a/apps/memos-local-openclaw/src/viewer/server.ts
+++ b/apps/memos-local-openclaw/src/viewer/server.ts
@@ -144,6 +144,8 @@ export class ViewerServer {
   private lastKnownNotifCount = 0;
   private hubHeartbeatTimer?: ReturnType<typeof setInterval>;
   private static readonly HUB_HEARTBEAT_INTERVAL_MS = 45_000;
+  private static readonly STALE_TASK_TIMEOUT_MS = 4 * 60 * 60 * 1000;
+  private staleFinalizeRunning = false;
 
   constructor(opts: ViewerServerOptions) {
     this.store = opts.store;
@@ -315,6 +317,7 @@ export class ViewerServer {
       else if (p === "/api/tool-metrics") this.serveToolMetrics(res, url);
       else if (p === "/api/search") this.serveSearch(req, res, url);
       else if (p === "/api/tasks" && req.method === "GET") this.serveTasks(res, url);
+      else if (p === "/api/task-search" && req.method === "GET") this.serveTaskSearch(res, url);
       else if (p.match(/^\/api\/task\/[^/]+\/retry-skill$/) && req.method === "POST") this.handleTaskRetrySkill(req, res, p);
       else if (p.startsWith("/api/task/") && req.method === "DELETE") this.handleTaskDelete(res, p);
       else if (p.startsWith("/api/task/") && req.method === "PUT") this.handleTaskUpdate(req, res, p);
@@ -323,6 +326,8 @@ export class ViewerServer {
       else if (p.match(/^\/api\/skill\/[^/]+\/download$/) && req.method === "GET") this.serveSkillDownload(res, p);
       else if (p.match(/^\/api\/skill\/[^/]+\/files$/) && req.method === "GET") this.serveSkillFiles(res, p);
       else if (p.match(/^\/api\/skill\/[^/]+\/visibility$/) && req.method === "PUT") this.handleSkillVisibility(req, res, p);
+      else if (p.match(/^\/api\/skill\/[^/]+\/disable$/) && req.method === "PUT") this.handleSkillDisable(res, p);
+      else if (p.match(/^\/api\/skill\/[^/]+\/enable$/) && req.method === "PUT") this.handleSkillEnable(res, p);
       else if (p.startsWith("/api/skill/") && req.method === "DELETE") this.handleSkillDelete(res, p);
       else if (p.startsWith("/api/skill/") && req.method === "PUT") this.handleSkillUpdate(req, res, p);
       else if (p.startsWith("/api/skill/") && req.method === "GET") this.serveSkillDetail(res, p);
@@ -608,14 +613,16 @@ export class ViewerServer {
     this.store.recordViewerEvent("tasks_list");
     const status = url.searchParams.get("status") ?? undefined;
     const owner = url.searchParams.get("owner") ?? undefined;
+    const session = url.searchParams.get("session") ?? undefined;
     const limit = Math.min(100, Math.max(1, Number(url.searchParams.get("limit")) || 50));
     const offset = Math.max(0, Number(url.searchParams.get("offset")) || 0);
-    const { tasks, total } = this.store.listTasks({ status, limit, offset, owner });
+    const { tasks, total } = this.store.listTasks({ status, limit, offset, owner, session });
 
     const db = (this.store as any).db;
     const items = tasks.map((t) => {
       const meta = db.prepare("SELECT skill_status, owner FROM tasks WHERE id = ?").get(t.id) as { skill_status: string | null; owner: string | null } | undefined;
       const hubTask = this.getHubTaskForLocal(t.id);
+      const share = this.resolveTaskTeamShareForApi(t.id, hubTask);
       return {
         id: t.id,
         sessionKey: t.sessionKey,
@@ -627,11 +634,125 @@ export class ViewerServer {
         chunkCount: this.store.countChunksByTask(t.id),
         skillStatus: meta?.skill_status ?? null,
         owner: meta?.owner ?? "agent:main",
-        sharingVisibility: hubTask?.visibility ?? null,
+        sharingVisibility: share.visibility,
       };
     });
 
+    this.backfillTaskEmbeddings(items);
     this.jsonResponse(res, { tasks: items, total, limit, offset });
+    this.autoFinalizeStaleTasks();
+  }
+
+  private getTaskAutoFinalizeMs(): number {
+    const hours = this.ctx?.config?.taskAutoFinalizeHours;
+    if (hours !== undefined && hours !== null) return hours * 60 * 60 * 1000;
+    try {
+      const cfgPath = this.getOpenClawConfigPath();
+      if (fs.existsSync(cfgPath)) {
+        const raw = JSON.parse(fs.readFileSync(cfgPath, "utf-8"));
+        const entries = raw?.plugins?.entries ?? {};
+        const pluginCfg = entries["memos-local-openclaw-plugin"]?.config
+          ?? entries["memos-local"]?.config ?? {};
+        if (pluginCfg.taskAutoFinalizeHours !== undefined) return pluginCfg.taskAutoFinalizeHours * 60 * 60 * 1000;
+      }
+    } catch { /* fall through */ }
+    return ViewerServer.STALE_TASK_TIMEOUT_MS;
+  }
+
+  private autoFinalizeStaleTasks(): void {
+    if (this.staleFinalizeRunning || !this.ctx) return;
+    const thresholdMs = this.getTaskAutoFinalizeMs();
+    if (thresholdMs <= 0) return;
+    const db = (this.store as any).db;
+    const now = Date.now();
+    let staleTasks: Array<{ id: string }>;
+    try {
+      staleTasks = db.prepare(`
+        SELECT t.id
+        FROM tasks t
+        LEFT JOIN chunks c ON c.task_id = t.id
+        WHERE t.status = 'active'
+        GROUP BY t.id
+        HAVING (? - COALESCE(MAX(c.created_at), t.started_at)) > ?
+      `).all(now, thresholdMs) as Array<{ id: string }>;
+    } catch { return; }
+    if (staleTasks.length === 0) return;
+
+    this.staleFinalizeRunning = true;
+    const hours = Math.round(thresholdMs / 3600000);
+    this.log.info(`Auto-finalizing ${staleTasks.length} stale active task(s) (idle > ${hours}h)`);
+    const tp = new TaskProcessor(this.store, this.ctx);
+    (async () => {
+      for (const row of staleTasks) {
+        const task = this.store.getTask(row.id);
+        if (!task || task.status !== "active") continue;
+        try {
+          await tp.finalizeTask(task);
+          this.log.info(`Auto-finalized stale task=${task.id}`);
+        } catch (err) {
+          this.log.warn(`Failed to auto-finalize task=${task.id}: ${err}`);
+        }
+      }
+    })().catch((err) => this.log.warn(`autoFinalizeStaleTasks error: ${err}`))
+      .finally(() => { this.staleFinalizeRunning = false; });
+  }
+
+  private async serveTaskSearch(res: http.ServerResponse, url: URL): Promise<void> {
+    const q = (url.searchParams.get("q") ?? "").trim();
+    if (!q) { this.jsonResponse(res, { tasks: [], total: 0 }); return; }
+
+    const owner = url.searchParams.get("owner") ?? undefined;
+    const maxResults = Math.min(50, Math.max(1, Number(url.searchParams.get("limit")) || 20));
+
+    const scoreMap = new Map<string, number>();
+
+    if (this.embedder) {
+      try {
+        const [queryVec] = await this.embedder.embed([q]);
+        const allEmb = this.store.getTaskEmbeddings(owner);
+        for (const { taskId, vector } of allEmb) {
+          let dot = 0, normA = 0, normB = 0;
+          for (let i = 0; i < queryVec.length && i < vector.length; i++) {
+            dot += queryVec[i] * vector[i];
+            normA += queryVec[i] * queryVec[i];
+            normB += vector[i] * vector[i];
+          }
+          const sim = normA > 0 && normB > 0 ? dot / (Math.sqrt(normA) * Math.sqrt(normB)) : 0;
+          if (sim > 0.3) scoreMap.set(taskId, sim);
+        }
+      } catch { /* embedding unavailable, fall through to FTS */ }
+    }
+
+    const ftsResults = this.store.taskFtsSearch(q, maxResults, owner);
+    for (const { taskId, score } of ftsResults) {
+      const existing = scoreMap.get(taskId) ?? 0;
+      scoreMap.set(taskId, Math.max(existing, score * 0.8));
+    }
+
+    const sorted = [...scoreMap.entries()]
+      .sort((a, b) => b[1] - a[1])
+      .slice(0, maxResults);
+
+    const db = (this.store as any).db;
+    const tasks = sorted.map(([taskId, score]) => {
+      const t = this.store.getTask(taskId);
+      if (!t) return null;
+      const meta = db.prepare("SELECT skill_status, owner FROM tasks WHERE id = ?").get(taskId) as { skill_status: string | null; owner: string | null } | undefined;
+      const hubTask = this.getHubTaskForLocal(taskId);
+      const ts = this.resolveTaskTeamShareForApi(taskId, hubTask);
+      return {
+        id: t.id, sessionKey: t.sessionKey, title: t.title,
+        summary: t.summary ?? "", status: t.status,
+        startedAt: t.startedAt, endedAt: t.endedAt,
+        chunkCount: this.store.countChunksByTask(t.id),
+        skillStatus: meta?.skill_status ?? null,
+        owner: meta?.owner ?? "agent:main",
+        sharingVisibility: ts.visibility,
+        score,
+      };
+    }).filter(Boolean);
+
+    this.jsonResponse(res, { tasks, total: tasks.length });
   }
 
   private serveTaskDetail(res: http.ServerResponse, urlPath: string): void {
@@ -663,6 +784,7 @@ export class ViewerServer {
     const meta = db.prepare("SELECT skill_status, skill_reason FROM tasks WHERE id = ?").get(taskId) as
       { skill_status: string | null; skill_reason: string | null } | undefined;
     const hubTask = this.getHubTaskForLocal(taskId);
+    const ts = this.resolveTaskTeamShareForApi(taskId, hubTask);
 
     this.jsonResponse(res, {
       id: task.id,
@@ -677,15 +799,15 @@ export class ViewerServer {
       skillStatus: meta?.skill_status ?? null,
       skillReason: meta?.skill_reason ?? null,
       skillLinks,
-      sharingVisibility: hubTask?.visibility ?? null,
-      sharingGroupId: hubTask?.group_id ?? null,
-      hubTaskId: hubTask ? true : false,
+      sharingVisibility: ts.visibility,
+      sharingGroupId: ts.groupId,
+      hubTaskId: ts.hasHubLink,
     });
   }
 
   private serveStats(res: http.ServerResponse, url?: URL): void {
     const emptyStats = {
-      totalMemories: 0, totalSessions: 0, totalEmbeddings: 0, totalSkills: 0,
+      totalMemories: 0, totalSessions: 0, totalEmbeddings: 0, totalSkills: 0, totalTasks: 0,
       embeddingProvider: this.embedder?.provider ?? "none",
       dedupBreakdown: {},
       timeRange: { earliest: null, latest: null },
@@ -728,9 +850,30 @@ export class ViewerServer {
       }
       const sessionList = db.prepare(sessionQuery).all(...sessionParams) as any[];
 
+      let taskSessionList: Array<{ session_key: string; count: number; earliest: number | null; latest: number | null }> = [];
+      try {
+        taskSessionList = db.prepare(
+          "SELECT session_key, COUNT(*) as count, MIN(started_at) as earliest, MAX(COALESCE(updated_at, started_at)) as latest FROM tasks GROUP BY session_key ORDER BY latest DESC",
+        ).all() as any[];
+      } catch { /* tasks table may not exist yet */ }
+
+      let skillSessionList: Array<{ session_key: string; count: number; earliest: number | null; latest: number | null }> = [];
+      try {
+        skillSessionList = db.prepare(
+          `SELECT t.session_key as session_key, COUNT(DISTINCT ts.skill_id) as count,
+                  MIN(t.started_at) as earliest, MAX(COALESCE(t.updated_at, t.started_at)) as latest
+             FROM task_skills ts JOIN tasks t ON t.id = ts.task_id
+            GROUP BY t.session_key
+            ORDER BY latest DESC`,
+        ).all() as any[];
+      } catch { /* task_skills may not exist yet */ }
+
       let skillCount = 0;
       try { skillCount = (db.prepare("SELECT COUNT(*) as count FROM skills").get() as any).count; } catch { /* table may not exist yet */ }
 
+      let taskCount = 0;
+      try { taskCount = (db.prepare("SELECT COUNT(*) as count FROM tasks").get() as any).count; } catch { /* table may not exist yet */ }
+
       let dedupBreakdown: Record<string, number> = {};
       try {
         const dedupRows = db.prepare("SELECT dedup_status, COUNT(*) as count FROM chunks GROUP BY dedup_status").all() as any[];
@@ -739,7 +882,15 @@ export class ViewerServer {
 
       let owners: string[] = [];
       try {
-        const ownerRows = db.prepare("SELECT DISTINCT owner FROM chunks WHERE owner IS NOT NULL AND owner LIKE 'agent:%' ORDER BY owner").all() as any[];
+        const ownerRows = db.prepare(`
+          SELECT DISTINCT owner FROM (
+            SELECT owner FROM chunks WHERE owner IS NOT NULL AND owner LIKE 'agent:%'
+            UNION
+            SELECT owner FROM tasks WHERE owner IS NOT NULL AND owner LIKE 'agent:%'
+            UNION
+            SELECT owner FROM skills WHERE owner IS NOT NULL AND owner LIKE 'agent:%'
+          ) ORDER BY owner
+        `).all() as any[];
         owners = ownerRows.map((o: any) => o.owner);
       } catch { /* column may not exist yet */ }
 
@@ -751,11 +902,13 @@ export class ViewerServer {
 
       this.jsonResponse(res, {
         totalMemories: total.count, totalSessions: sessions.count, totalEmbeddings: embCount,
-        totalSkills: skillCount,
+        totalSkills: skillCount, totalTasks: taskCount,
         embeddingProvider: this.embedder.provider,
         dedupBreakdown,
         timeRange: { earliest: timeRange.earliest, latest: timeRange.latest },
         sessions: sessionList,
+        taskSessions: taskSessionList,
+        skillSessions: skillSessionList,
         owners,
         currentAgentOwner,
       });
@@ -865,7 +1018,9 @@ export class ViewerServer {
   private serveSkills(res: http.ServerResponse, url: URL): void {
     const status = url.searchParams.get("status") ?? undefined;
     const visibility = url.searchParams.get("visibility") ?? undefined;
-    let skills = this.store.listSkills({ status });
+    const session = url.searchParams.get("session") ?? undefined;
+    const owner = url.searchParams.get("owner") ?? undefined;
+    let skills = this.store.listSkills({ status, session, owner });
     if (visibility) {
       skills = skills.filter(s => s.visibility === visibility);
     }
@@ -1104,6 +1259,27 @@ export class ViewerServer {
     });
   }
 
+  private embedTaskInBackground(taskId: string, text: string): void {
+    if (!this.embedder || !text.trim()) return;
+    this.embedder.embed([text]).then((vecs: number[][]) => {
+      if (vecs.length > 0) this.store.upsertTaskEmbedding(taskId, vecs[0]);
+    }).catch(() => {});
+  }
+
+  private backfillTaskEmbeddings(tasks: Array<{ id: string; summary: string; title: string }>): void {
+    if (!this.embedder) return;
+    const db = (this.store as any).db;
+    for (const t of tasks) {
+      try {
+        const exists = db.prepare("SELECT 1 FROM task_embeddings WHERE task_id = ?").get(t.id);
+        if (!exists) {
+          const text = `${t.title ?? ""}: ${t.summary ?? ""}`.trim();
+          if (text.length > 1) this.embedTaskInBackground(t.id, text);
+        }
+      } catch { /* best-effort */ }
+    }
+  }
+
   private handleTaskDelete(res: http.ServerResponse, urlPath: string): void {
     const taskId = urlPath.replace("/api/task/", "");
     const deleted = this.store.deleteTask(taskId);
@@ -1118,12 +1294,15 @@ export class ViewerServer {
         const data = JSON.parse(body);
         const task = this.store.getTask(taskId);
         if (!task) { res.writeHead(404, { "Content-Type": "application/json" }); res.end(JSON.stringify({ error: "Task not found" })); return; }
+        const newTitle = data.title ?? task.title;
+        const newSummary = data.summary ?? task.summary;
         this.store.updateTask(taskId, {
-          title: data.title ?? task.title,
-          summary: data.summary ?? task.summary,
+          title: newTitle,
+          summary: newSummary,
           status: data.status ?? task.status,
           endedAt: task.endedAt ?? undefined,
         });
+        this.embedTaskInBackground(taskId, `${newTitle ?? ""}: ${newSummary ?? ""}`);
         this.jsonResponse(res, { ok: true, taskId });
       } catch (err) {
         res.writeHead(400, { "Content-Type": "application/json" });
@@ -1180,6 +1359,58 @@ export class ViewerServer {
     });
   }
 
+  private async handleSkillDisable(res: http.ServerResponse, urlPath: string): Promise<void> {
+    const skillId = urlPath.split("/")[3];
+    const skill = this.store.getSkill(skillId);
+    if (!skill) { res.writeHead(404, { "Content-Type": "application/json" }); res.end(JSON.stringify({ error: "Skill not found" })); return; }
+    if (skill.status === "archived") { this.jsonResponse(res, { ok: true, skillId, message: "already disabled" }); return; }
+
+    try {
+      if (skill.visibility === "public") {
+        this.store.setSkillVisibility(skillId, "private");
+      }
+      const hub = this.resolveHubConnection();
+      if (hub) {
+        await hubRequestJson(hub.hubUrl, hub.userToken, "/api/v1/hub/skills/unpublish", {
+          method: "POST",
+          body: JSON.stringify({ sourceSkillId: skillId }),
+        }).catch(() => {});
+      }
+    } catch (_) {}
+
+    try {
+      const workspaceSkillsDir = path.join(this.dataDir, "workspace", "skills");
+      const installedDir = path.join(workspaceSkillsDir, skill.name);
+      if (fs.existsSync(installedDir)) {
+        fs.rmSync(installedDir, { recursive: true, force: true });
+      }
+    } catch (_) {}
+
+    this.store.disableSkill(skillId);
+    this.jsonResponse(res, { ok: true, skillId });
+  }
+
+  private handleSkillEnable(res: http.ServerResponse, urlPath: string): void {
+    const skillId = urlPath.split("/")[3];
+    const skill = this.store.getSkill(skillId);
+    if (!skill) { res.writeHead(404, { "Content-Type": "application/json" }); res.end(JSON.stringify({ error: "Skill not found" })); return; }
+    if (skill.status !== "archived") { res.writeHead(400, { "Content-Type": "application/json" }); res.end(JSON.stringify({ error: "Only disabled (archived) skills can be enabled" })); return; }
+
+    this.store.enableSkill(skillId);
+
+    if (this.embedder) {
+      const sv = this.store.getLatestSkillVersion(skillId);
+      if (sv) {
+        const text = `${skill.name}: ${skill.description}`;
+        this.embedder.embed([text]).then((vecs: number[][]) => {
+          if (vecs.length > 0) this.store.upsertSkillEmbedding(skillId, vecs[0]);
+        }).catch(() => {});
+      }
+    }
+
+    this.jsonResponse(res, { ok: true, skillId });
+  }
+
   // ─── CRUD ───
 
   private serveMemoryDetail(res: http.ServerResponse, urlPath: string): void {
@@ -1314,7 +1545,7 @@ export class ViewerServer {
             const refreshedChunk = db.prepare("SELECT * FROM chunks WHERE id = ?").get(chunkId) as any;
             const response = await hubRequestJson(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/memories/share", {
               method: "POST",
-              body: JSON.stringify({ memory: { sourceChunkId: refreshedChunk.id, role: refreshedChunk.role, content: refreshedChunk.content, summary: refreshedChunk.summary, kind: refreshedChunk.kind, groupId: null, visibility: "public" } }),
+              body: JSON.stringify({ memory: { sourceChunkId: refreshedChunk.id, sourceAgent: refreshedChunk.owner || "", role: refreshedChunk.role, content: refreshedChunk.content, summary: refreshedChunk.summary, kind: refreshedChunk.kind, groupId: null, visibility: "public" } }),
             });
             if (!isLocalShared) this.store.markMemorySharedLocally(chunkId);
             const memoryId = String((response as any)?.memoryId ?? "");
@@ -1324,6 +1555,7 @@ export class ViewerServer {
               this.store.upsertHubMemory({
                 id: memoryId || existing?.id || crypto.randomUUID(),
                 sourceChunkId: chunkId, sourceUserId: hubClient.userId,
+                sourceAgent: refreshedChunk.owner || "",
                 role: refreshedChunk.role, content: refreshedChunk.content, summary: refreshedChunk.summary ?? "",
                 kind: refreshedChunk.kind, groupId: null, visibility: "public",
                 createdAt: existing?.createdAt ?? Date.now(), updatedAt: Date.now(),
@@ -1389,7 +1621,8 @@ export class ViewerServer {
 
         const isLocalShared = task.owner === "public";
         const hubTask = this.getHubTaskForLocal(taskId);
-        const isTeamShared = !!hubTask;
+        const taskShareUi = this.resolveTaskTeamShareForApi(taskId, hubTask);
+        const isTeamShared = taskShareUi.hasHubLink;
         const currentScope = isTeamShared ? "team" : isLocalShared ? "local" : "private";
 
         if (scope === currentScope) {
@@ -1449,6 +1682,7 @@ export class ViewerServer {
             });
             if (this.sharingRole === "hub" && hubClient.userId) this.store.deleteHubTaskBySource(hubClient.userId, taskId);
             else this.store.downgradeTeamSharedTaskToLocal(taskId);
+            this.store.clearTeamSharedChunksForTask(taskId);
             hubSynced = true;
           } catch (err) { this.log.warn(`Failed to unshare task from team: ${err}`); }
         }
@@ -1462,6 +1696,8 @@ export class ViewerServer {
               });
               if (this.sharingRole === "hub" && hubClient.userId) this.store.deleteHubTaskBySource(hubClient.userId, taskId);
               else if (!isLocalShared) this.store.unmarkTaskShared(taskId);
+              else this.store.downgradeTeamSharedTaskToLocal(taskId);
+              this.store.clearTeamSharedChunksForTask(taskId);
               hubSynced = true;
             } catch (err) { this.log.warn(`Failed to unshare task from team: ${err}`); }
           }
@@ -1589,6 +1825,39 @@ export class ViewerServer {
     return scopedHubInstanceId === currentHubInstanceId;
   }
 
+  /**
+   * Task list/detail/search: derive team-share badge when getHubTaskForLocal misses (e.g. client
+   * hub_instance_id drift, or empty hub_task_id from hub while synced_chunks was recorded).
+   */
+  private resolveTaskTeamShareForApi(taskId: string, hubTask: any): { visibility: string | null; hasHubLink: boolean; groupId: string | null } {
+    if (hubTask) {
+      return {
+        visibility: hubTask.visibility ?? null,
+        hasHubLink: true,
+        groupId: hubTask.group_id ?? null,
+      };
+    }
+    const lst = this.store.getLocalSharedTask(taskId);
+    if (lst) {
+      const hid = String(lst.hubTaskId ?? "").trim();
+      const teamLinked = hid.length > 0 || (lst.syncedChunks ?? 0) > 0;
+      if (teamLinked) return { visibility: lst.visibility || null, hasHubLink: true, groupId: lst.groupId ?? null };
+    }
+    try {
+      const db = (this.store as any).db;
+      const chunkTeam = db.prepare(`
+        SELECT t.visibility AS v, t.group_id AS g FROM team_shared_chunks t
+        INNER JOIN chunks c ON c.id = t.chunk_id
+        WHERE c.task_id = ?
+        LIMIT 1
+      `).get(taskId) as { v: string; g: string | null } | undefined;
+      if (chunkTeam) {
+        return { visibility: chunkTeam.v || null, hasHubLink: true, groupId: chunkTeam.g ?? null };
+      }
+    } catch { /* schema / db edge */ }
+    return { visibility: null, hasHubLink: false, groupId: null };
+  }
+
   private getHubMemoryForChunk(chunkId: string): any {
     if (this.sharingRole === "hub") {
       const db = (this.store as any).db;
@@ -2133,6 +2402,7 @@ export class ViewerServer {
       ref: { sessionKey: row.session_key, chunkId: row.id, turnId: row.turn_id, seq: row.seq },
       taskId: row.task_id ?? null,
       skillId: row.skill_id ?? null,
+      owner: row.owner || "",
     }));
     return { hits, meta: { total: hits.length, usedMaxResults: maxResults } };
   }
@@ -2242,6 +2512,7 @@ export class ViewerServer {
           body: JSON.stringify({
             memory: {
               sourceChunkId: chunk.id,
+              sourceAgent: chunk.owner || "",
               role: chunk.role,
               content: chunk.content,
               summary: chunk.summary,
@@ -2259,6 +2530,7 @@ export class ViewerServer {
             id: mid || existing?.id || crypto.randomUUID(),
             sourceChunkId: chunk.id,
             sourceUserId: hubClient.userId,
+            sourceAgent: chunk.owner || "",
             role: chunk.role,
             content: chunk.content,
             summary: chunk.summary ?? "",
@@ -2807,6 +3079,7 @@ export class ViewerServer {
         if (newCfg.summarizer) config.summarizer = newCfg.summarizer;
         if (newCfg.skillEvolution) config.skillEvolution = newCfg.skillEvolution;
         if (newCfg.viewerPort) config.viewerPort = newCfg.viewerPort;
+        if (newCfg.taskAutoFinalizeHours !== undefined) config.taskAutoFinalizeHours = newCfg.taskAutoFinalizeHours;
         if (newCfg.telemetry !== undefined) config.telemetry = newCfg.telemetry;
         if (newCfg.sharing !== undefined) {
           const existing = (config.sharing as Record<string, unknown>) || {};
@@ -3467,7 +3740,7 @@ export class ViewerServer {
 
                 this.log.info(`update-install: running postinstall...`);
                 execFile(process.execPath, ["scripts/postinstall.cjs"], { cwd: extDir, timeout: 180_000 }, (postErr, postOut, postStderr) => {
-                  try { fs.rmSync(tmpDir, { recursive: true, force: true }); } catch {}
+                  cleanupTmpDir();
 
                   if (postErr) {
                     this.log.warn(`update-install: postinstall failed: ${postErr.message}`);
@@ -3751,7 +4024,7 @@ export class ViewerServer {
       try {
         if (this.store) {
           importedSessions = this.store.getDistinctSessionKeys()
-            .filter((sk: string) => sk.startsWith("openclaw-import-") || sk.startsWith("openclaw-session-"));
+            .filter((sk: string) => sk.startsWith("openclaw-import-") || sk.startsWith("openclaw-session-") || /^agent:[^:]+:(import|session:)/.test(sk));
           if (importedSessions.length > 0) {
             const placeholders = importedSessions.map(() => "?").join(",");
             const row = (this.store as any).db.prepare(
@@ -3964,7 +4237,7 @@ export class ViewerServer {
               totalProcessed++;
 
               const contentHash = crypto.createHash("sha256").update(row.text).digest("hex");
-              if (this.store.chunkExistsByContent(`openclaw-import-${agentId}`, "assistant", row.text)) {
+              if (this.store.chunkExistsByContent(`agent:${agentId}:import`, "assistant", row.text) || this.store.chunkExistsByContent(`openclaw-import-${agentId}`, "assistant", row.text)) {
                 totalSkipped++;
                 send("item", {
                   index: i + 1,
@@ -4064,7 +4337,7 @@ export class ViewerServer {
                 const chunkId = uuid();
                 const chunk: Chunk = {
                   id: chunkId,
-                  sessionKey: `openclaw-import-${agentId}`,
+                  sessionKey: `agent:${agentId}:import`,
                   turnId: `import-${row.id}`,
                   seq: 0,
                   role: "assistant",
@@ -4219,8 +4492,8 @@ export class ViewerServer {
               const idx = incIdx();
               totalProcessed++;
 
-              const sessionKey = `openclaw-session-${sessionId}`;
-              if (this.store.chunkExistsByContent(sessionKey, msgRole, content)) {
+              const sessionKey = `agent:${agentId}:session:${sessionId}`;
+              if (this.store.chunkExistsByContent(sessionKey, msgRole, content) || this.store.chunkExistsByContent(`openclaw-session-${sessionId}`, msgRole, content)) {
                 totalSkipped++;
                 send("item", { index: idx, total: totalMsgs, status: "skipped", preview: content.slice(0, 120), source: file, agent: agentId, role: msgRole, reason: "duplicate" });
                 continue;
@@ -4471,7 +4744,7 @@ export class ViewerServer {
     const ctx = this.ctx!;
 
     const importSessions = this.store.getDistinctSessionKeys()
-      .filter((sk: string) => sk.startsWith("openclaw-import-") || sk.startsWith("openclaw-session-"));
+      .filter((sk: string) => sk.startsWith("openclaw-import-") || sk.startsWith("openclaw-session-") || /^agent:[^:]+:(import|session:)/.test(sk));
 
     type PendingItem = { sessionKey: string; action: "full" | "skill-only"; owner: string };
     const pendingItems: PendingItem[] = [];
diff --git a/apps/memos-local-openclaw/tests/context-engine.test.ts b/apps/memos-local-openclaw/tests/context-engine.test.ts
deleted file mode 100644
index 9dba4b143..000000000
--- a/apps/memos-local-openclaw/tests/context-engine.test.ts
+++ /dev/null
@@ -1,534 +0,0 @@
-import { describe, it, expect } from "vitest";
-import {
-  type AgentMessage,
-  type SearchHit,
-  getTextFromMessage,
-  appendMemoryToMessage,
-  removeExistingMemoryBlock,
-  messageHasMemoryBlock,
-  formatMemoryBlock,
-  deduplicateHits,
-  insertSyntheticAssistantEntry,
-  findTargetAssistantEntry,
-} from "../src/context-engine";
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-function makeMsg(role: string, text: string): AgentMessage {
-  return { role, content: [{ type: "text", text }], timestamp: Date.now() };
-}
-
-function makeStringMsg(role: string, text: string): AgentMessage {
-  return { role, content: text, timestamp: Date.now() };
-}
-
-function makeHit(overrides?: Partial<SearchHit>): SearchHit {
-  return {
-    score: 0.85,
-    summary: "test memory summary",
-    original_excerpt: "test memory excerpt content",
-    source: { role: "user", ts: Date.now(), sessionKey: "s1" },
-    ref: { chunkId: "c1", sessionKey: "s1", turnId: "t1", seq: 0 },
-    taskId: null,
-    skillId: null,
-    origin: "local",
-    ...overrides,
-  };
-}
-
-// ---------------------------------------------------------------------------
-// getTextFromMessage
-// ---------------------------------------------------------------------------
-
-describe("getTextFromMessage", () => {
-  it("extracts text from string content", () => {
-    const msg = makeStringMsg("assistant", "hello world");
-    expect(getTextFromMessage(msg)).toBe("hello world");
-  });
-
-  it("extracts text from content block array", () => {
-    const msg: AgentMessage = {
-      role: "assistant",
-      content: [
-        { type: "text", text: "part one" },
-        { type: "image", url: "http://..." },
-        { type: "text", text: "part two" },
-      ],
-    };
-    expect(getTextFromMessage(msg)).toBe("part onepart two");
-  });
-
-  it("returns empty string for non-text content", () => {
-    const msg: AgentMessage = {
-      role: "assistant",
-      content: [{ type: "image", url: "http://..." }],
-    };
-    expect(getTextFromMessage(msg)).toBe("");
-  });
-
-  it("returns empty string for undefined content", () => {
-    const msg: AgentMessage = { role: "assistant", content: "" };
-    expect(getTextFromMessage(msg)).toBe("");
-  });
-});
-
-// ---------------------------------------------------------------------------
-// appendMemoryToMessage
-// ---------------------------------------------------------------------------
-
-describe("appendMemoryToMessage", () => {
-  it("appends to string content", () => {
-    const msg = makeStringMsg("assistant", "response text");
-    appendMemoryToMessage(msg, "\n<relevant-memories>\nmem\n</relevant-memories>");
-    expect(msg.content).toBe(
-      "response text\n<relevant-memories>\nmem\n</relevant-memories>",
-    );
-  });
-
-  it("appends to last text block in content array", () => {
-    const msg = makeMsg("assistant", "response text");
-    appendMemoryToMessage(msg, "\n<relevant-memories>\nmem\n</relevant-memories>");
-    const blocks = msg.content as Array<{ type: string; text?: string }>;
-    expect(blocks[0].text).toBe(
-      "response text\n<relevant-memories>\nmem\n</relevant-memories>",
-    );
-  });
-
-  it("creates a new text block if none exist", () => {
-    const msg: AgentMessage = {
-      role: "assistant",
-      content: [{ type: "image", url: "http://..." }],
-    };
-    appendMemoryToMessage(msg, "\n<relevant-memories>\nmem\n</relevant-memories>");
-    const blocks = msg.content as Array<{ type: string; text?: string }>;
-    expect(blocks).toHaveLength(2);
-    expect(blocks[1].type).toBe("text");
-    expect(blocks[1].text).toContain("<relevant-memories>");
-  });
-
-  it("handles empty content by setting it", () => {
-    const msg: AgentMessage = { role: "assistant", content: undefined as any };
-    appendMemoryToMessage(msg, "memory");
-    expect(msg.content).toBe("memory");
-  });
-});
-
-// ---------------------------------------------------------------------------
-// removeExistingMemoryBlock
-// ---------------------------------------------------------------------------
-
-describe("removeExistingMemoryBlock", () => {
-  it("removes memory block from string content", () => {
-    const msg = makeStringMsg(
-      "assistant",
-      "response text\n<relevant-memories>\nsome memories\n</relevant-memories>",
-    );
-    removeExistingMemoryBlock(msg);
-    expect(msg.content).toBe("response text");
-  });
-
-  it("removes memory block from content block array", () => {
-    const msg = makeMsg(
-      "assistant",
-      "response text\n<relevant-memories>\nsome memories\n</relevant-memories>",
-    );
-    removeExistingMemoryBlock(msg);
-    const blocks = msg.content as Array<{ type: string; text: string }>;
-    expect(blocks[0].text).toBe("response text");
-  });
-
-  it("handles message without memory block (no-op)", () => {
-    const msg = makeMsg("assistant", "clean response");
-    removeExistingMemoryBlock(msg);
-    expect(getTextFromMessage(msg)).toBe("clean response");
-  });
-
-  it("removes multiple memory blocks", () => {
-    const msg = makeStringMsg(
-      "assistant",
-      "text\n<relevant-memories>\nmem1\n</relevant-memories>\nmore\n<relevant-memories>\nmem2\n</relevant-memories>",
-    );
-    removeExistingMemoryBlock(msg);
-    expect(msg.content).toBe("text\nmore");
-  });
-});
-
-// ---------------------------------------------------------------------------
-// messageHasMemoryBlock
-// ---------------------------------------------------------------------------
-
-describe("messageHasMemoryBlock", () => {
-  it("returns true when memory block exists", () => {
-    const msg = makeMsg(
-      "assistant",
-      "text\n<relevant-memories>\nmem\n</relevant-memories>",
-    );
-    expect(messageHasMemoryBlock(msg)).toBe(true);
-  });
-
-  it("returns false when no memory block", () => {
-    const msg = makeMsg("assistant", "clean text");
-    expect(messageHasMemoryBlock(msg)).toBe(false);
-  });
-});
-
-// ---------------------------------------------------------------------------
-// formatMemoryBlock
-// ---------------------------------------------------------------------------
-
-describe("formatMemoryBlock", () => {
-  it("formats hits into a memory block with tags", () => {
-    const hits: SearchHit[] = [
-      makeHit({ source: { role: "user" }, original_excerpt: "user said hello" }),
-      makeHit({ source: { role: "assistant" }, original_excerpt: "bot replied hi" }),
-    ];
-    const block = formatMemoryBlock(hits);
-    expect(block).toContain("<relevant-memories>");
-    expect(block).toContain("</relevant-memories>");
-    expect(block).toContain("1. [user] user said hello");
-    expect(block).toContain("2. [assistant] bot replied hi");
-    expect(block).toContain("not part of assistant's original reply");
-  });
-
-  it("truncates excerpts at 200 chars", () => {
-    const longExcerpt = "x".repeat(300);
-    const hits = [makeHit({ original_excerpt: longExcerpt })];
-    const block = formatMemoryBlock(hits);
-    const match = block.match(/1\. \[user\] (x+)/);
-    expect(match).toBeTruthy();
-    expect(match![1].length).toBe(200);
-  });
-
-  it("falls back to summary when excerpt is missing", () => {
-    const hits = [
-      makeHit({ original_excerpt: undefined, summary: "summary fallback" }),
-    ];
-    const block = formatMemoryBlock(hits);
-    expect(block).toContain("summary fallback");
-  });
-});
-
-// ---------------------------------------------------------------------------
-// deduplicateHits
-// ---------------------------------------------------------------------------
-
-describe("deduplicateHits", () => {
-  it("removes near-duplicate hits by summary overlap", () => {
-    const hits = [
-      { summary: "the quick brown fox jumps over the lazy dog", score: 0.9 },
-      { summary: "the quick brown fox jumps over a lazy dog", score: 0.8 },
-      { summary: "completely different summary about cats", score: 0.7 },
-    ];
-    const result = deduplicateHits(hits);
-    expect(result).toHaveLength(2);
-    expect(result[0].score).toBe(0.9);
-    expect(result[1].summary).toContain("cats");
-  });
-
-  it("keeps all hits when no duplicates", () => {
-    const hits = [
-      { summary: "alpha beta gamma", score: 0.9 },
-      { summary: "delta epsilon zeta", score: 0.8 },
-    ];
-    expect(deduplicateHits(hits)).toHaveLength(2);
-  });
-
-  it("handles empty input", () => {
-    expect(deduplicateHits([])).toHaveLength(0);
-  });
-
-  it("handles exact duplicate summaries", () => {
-    const hits = [
-      { summary: "exactly the same", score: 0.9 },
-      { summary: "exactly the same", score: 0.7 },
-    ];
-    expect(deduplicateHits(hits)).toHaveLength(1);
-    expect(deduplicateHits(hits)[0].score).toBe(0.9);
-  });
-});
-
-// ---------------------------------------------------------------------------
-// SessionManager mock for insertSyntheticAssistantEntry and findTargetAssistantEntry
-// ---------------------------------------------------------------------------
-
-class MockSessionManager {
-  private entries: Array<{
-    id: string;
-    type: string;
-    parentId?: string | null;
-    message?: AgentMessage;
-    [key: string]: unknown;
-  }> = [];
-  private nextId = 1;
-  private branchedFrom: string | null = null;
-  public appendedMessages: unknown[] = [];
-
-  addEntry(type: string, message?: AgentMessage, parentId?: string | null) {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({ id, type, parentId: parentId ?? null, message });
-    return id;
-  }
-
-  getBranch() {
-    return [...this.entries];
-  }
-
-  branch(parentId: string) {
-    this.branchedFrom = parentId;
-    this.entries = [];
-    this.nextId = 100;
-  }
-
-  resetLeaf() {
-    this.branchedFrom = "__root__";
-    this.entries = [];
-    this.nextId = 100;
-  }
-
-  appendMessage(msg: unknown): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({
-      id,
-      type: "message",
-      parentId: null,
-      message: msg as AgentMessage,
-    });
-    this.appendedMessages.push(msg);
-    return id;
-  }
-
-  appendCompaction(
-    summary: string,
-    firstKeptEntryId: string,
-    tokensBefore: number,
-    details?: unknown,
-    fromHook?: unknown,
-  ): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({
-      id,
-      type: "compaction",
-      summary,
-      firstKeptEntryId,
-      tokensBefore,
-      details,
-      fromHook,
-    });
-    return id;
-  }
-
-  appendThinkingLevelChange(level: string): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({ id, type: "thinking_level_change", thinkingLevel: level });
-    return id;
-  }
-
-  appendModelChange(provider: string, modelId: string): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({ id, type: "model_change", provider, modelId });
-    return id;
-  }
-
-  appendCustomEntry(customType: string, data: unknown): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({ id, type: "custom", customType, data });
-    return id;
-  }
-
-  appendCustomMessageEntry(
-    customType: string,
-    content: unknown,
-    display: unknown,
-    details?: unknown,
-  ): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({ id, type: "custom_message", customType, content, display, details });
-    return id;
-  }
-
-  appendSessionInfo(name: string): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({ id, type: "session_info", name });
-    return id;
-  }
-
-  branchWithSummary(
-    parentId: string | null,
-    summary: string,
-    details?: unknown,
-    fromHook?: unknown,
-  ): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({ id, type: "branch_summary", parentId, summary, details, fromHook });
-    return id;
-  }
-
-  appendLabelChange(targetId: string, label: string): string {
-    const id = `entry-${this.nextId++}`;
-    this.entries.push({ id, type: "label_change", targetId, label });
-    return id;
-  }
-
-  getBranchedFrom() {
-    return this.branchedFrom;
-  }
-}
-
-// ---------------------------------------------------------------------------
-// insertSyntheticAssistantEntry
-// ---------------------------------------------------------------------------
-
-describe("insertSyntheticAssistantEntry", () => {
-  it("inserts synthetic assistant before existing entries", () => {
-    const sm = new MockSessionManager();
-    sm.addEntry("message", makeMsg("user", "hello"), null);
-    sm.addEntry("message", makeMsg("assistant", "hi there"));
-
-    const memBlock =
-      "\n<relevant-memories>\n[Memory context]\n1. test mem\n</relevant-memories>";
-    const ok = insertSyntheticAssistantEntry(sm as any, memBlock);
-
-    expect(ok).toBe(true);
-    const branch = sm.getBranch();
-    expect(branch).toHaveLength(3);
-    expect(branch[0].type).toBe("message");
-    expect(branch[0].message?.role).toBe("assistant");
-    expect(getTextFromMessage(branch[0].message!)).toContain("<relevant-memories>");
-    expect(branch[1].message?.role).toBe("user");
-    expect(branch[2].message?.role).toBe("assistant");
-  });
-
-  it("returns false for empty branch", () => {
-    const sm = new MockSessionManager();
-    const ok = insertSyntheticAssistantEntry(sm as any, "mem");
-    expect(ok).toBe(false);
-  });
-
-  it("preserves non-message entries during reappend", () => {
-    const sm = new MockSessionManager();
-    sm.addEntry("message", makeMsg("user", "hello"), "root-id");
-    sm.addEntry("thinking_level_change", undefined);
-    (sm.getBranch()[1] as any).thinkingLevel = "high";
-    sm.addEntry("message", makeMsg("assistant", "response"));
-
-    const ok = insertSyntheticAssistantEntry(sm as any, "mem");
-    expect(ok).toBe(true);
-
-    const branch = sm.getBranch();
-    expect(branch.length).toBeGreaterThanOrEqual(3);
-    const types = branch.map((e) => e.type);
-    expect(types[0]).toBe("message");
-    expect(types).toContain("thinking_level_change");
-  });
-
-  it("calls resetLeaf when first entry has no parentId", () => {
-    const sm = new MockSessionManager();
-    sm.addEntry("message", makeMsg("user", "hello"), null);
-
-    insertSyntheticAssistantEntry(sm as any, "mem");
-    expect(sm.getBranchedFrom()).toBe("__root__");
-  });
-
-  it("calls branch with parentId when first entry has one", () => {
-    const sm = new MockSessionManager();
-    sm.addEntry("message", makeMsg("user", "hello"), "parent-123");
-
-    insertSyntheticAssistantEntry(sm as any, "mem");
-    expect(sm.getBranchedFrom()).toBe("parent-123");
-  });
-});
-
-// ---------------------------------------------------------------------------
-// findTargetAssistantEntry
-// ---------------------------------------------------------------------------
-
-describe("findTargetAssistantEntry", () => {
-  it("finds last assistant before last user", () => {
-    const branch = [
-      { id: "e1", type: "message", message: makeMsg("user", "q1") },
-      { id: "e2", type: "message", message: makeMsg("assistant", "a1") },
-      { id: "e3", type: "message", message: makeMsg("user", "q2") },
-    ];
-    const target = findTargetAssistantEntry(branch);
-    expect(target).not.toBeNull();
-    expect(target!.id).toBe("e2");
-  });
-
-  it("returns null when no assistant before user", () => {
-    const branch = [
-      { id: "e1", type: "message", message: makeMsg("user", "q1") },
-    ];
-    expect(findTargetAssistantEntry(branch)).toBeNull();
-  });
-
-  it("returns null for empty branch", () => {
-    expect(findTargetAssistantEntry([])).toBeNull();
-  });
-
-  it("skips non-message entries", () => {
-    const branch = [
-      { id: "e1", type: "message", message: makeMsg("assistant", "a0") },
-      { id: "e2", type: "compaction", summary: "compacted" },
-      { id: "e3", type: "message", message: makeMsg("user", "q1") },
-      { id: "e4", type: "message", message: makeMsg("assistant", "a1") },
-      { id: "e5", type: "message", message: makeMsg("user", "q2") },
-    ];
-    const target = findTargetAssistantEntry(branch);
-    expect(target!.id).toBe("e4");
-  });
-
-  it("picks the immediate assistant before the last user, not an earlier one", () => {
-    const branch = [
-      { id: "e1", type: "message", message: makeMsg("assistant", "a0") },
-      { id: "e2", type: "message", message: makeMsg("user", "q1") },
-      { id: "e3", type: "message", message: makeMsg("assistant", "a1") },
-      { id: "e4", type: "message", message: makeMsg("assistant", "a2") },
-      { id: "e5", type: "message", message: makeMsg("user", "q2") },
-    ];
-    const target = findTargetAssistantEntry(branch);
-    expect(target!.id).toBe("e4");
-  });
-});
-
-// ---------------------------------------------------------------------------
-// Integration: full injection + removal cycle
-// ---------------------------------------------------------------------------
-
-describe("injection cycle integration", () => {
-  it("inject → detect → remove → re-inject produces clean result", () => {
-    const msg = makeMsg("assistant", "original response");
-
-    const mem1 = formatMemoryBlock([
-      makeHit({ original_excerpt: "user likes cats" }),
-    ]);
-    appendMemoryToMessage(msg, mem1);
-    expect(messageHasMemoryBlock(msg)).toBe(true);
-    expect(getTextFromMessage(msg)).toContain("user likes cats");
-
-    removeExistingMemoryBlock(msg);
-    expect(messageHasMemoryBlock(msg)).toBe(false);
-    expect(getTextFromMessage(msg)).toBe("original response");
-
-    const mem2 = formatMemoryBlock([
-      makeHit({ original_excerpt: "user likes dogs" }),
-    ]);
-    appendMemoryToMessage(msg, mem2);
-    expect(messageHasMemoryBlock(msg)).toBe(true);
-    expect(getTextFromMessage(msg)).toContain("user likes dogs");
-    expect(getTextFromMessage(msg)).not.toContain("user likes cats");
-  });
-
-  it("works with string content messages", () => {
-    const msg = makeStringMsg("assistant", "string response");
-    const mem = formatMemoryBlock([makeHit({ original_excerpt: "mem1" })]);
-
-    appendMemoryToMessage(msg, mem);
-    expect(messageHasMemoryBlock(msg)).toBe(true);
-
-    removeExistingMemoryBlock(msg);
-    expect(msg.content).toBe("string response");
-    expect(messageHasMemoryBlock(msg)).toBe(false);
-  });
-});
diff --git a/apps/memos-local-openclaw/tests/hub-server.test.ts b/apps/memos-local-openclaw/tests/hub-server.test.ts
index e0d0de350..b348e2e78 100644
--- a/apps/memos-local-openclaw/tests/hub-server.test.ts
+++ b/apps/memos-local-openclaw/tests/hub-server.test.ts
@@ -191,6 +191,7 @@ describe("hub server", () => {
       id: "offline-memory-1",
       sourceChunkId: "offline-chunk-1",
       sourceUserId: offlineUserId,
+      sourceAgent: "",
       role: "assistant",
       content: "offline memory content",
       summary: "offline memory",
diff --git a/apps/memos-local-openclaw/tests/task-processor.test.ts b/apps/memos-local-openclaw/tests/task-processor.test.ts
index eedd3f4be..48cc2437d 100644
--- a/apps/memos-local-openclaw/tests/task-processor.test.ts
+++ b/apps/memos-local-openclaw/tests/task-processor.test.ts
@@ -285,7 +285,7 @@ describe("TaskProcessor", () => {
     const now = Date.now();
     const gap = 121 * 60 * 1000;
 
-    vi.spyOn((processor as any).summarizer, "judgeNewTopic").mockResolvedValue(null);
+    vi.spyOn((processor as any).summarizer, "classifyTopic").mockResolvedValue(null);
 
     insertTestChunk({ id: "d1", sessionKey: "s1", role: "user", content: "what is my name and who am I please tell me", createdAt: now });
     insertTestChunk({ id: "d2", sessionKey: "s1", role: "assistant", content: "I do not have any information about your name or identity in my memory at this time", createdAt: now + 1 });
@@ -392,11 +392,13 @@ describe("TaskProcessor with LLM topic boundary detection", () => {
     });
   }
 
-  it("should split task when LLM judges new topic", async () => {
+  it("should split task when classifier judges NEW topic", async () => {
     const ctx = makeCtx();
     const proc = new TaskProcessor(store, ctx);
 
-    vi.spyOn(Summarizer.prototype, "judgeNewTopic").mockResolvedValue(true);
+    vi.spyOn(Summarizer.prototype, "classifyTopic").mockResolvedValue({
+      decision: "NEW", confidence: 0.9, boundaryType: "new_domain_shift", reason: "completely different domain",
+    });
 
     const now = Date.now();
     insertChunk({ id: "a1", summary: "deploy app to server", content: "deploy app to server", createdAt: now });
@@ -418,11 +420,13 @@ describe("TaskProcessor with LLM topic boundary detection", () => {
     vi.restoreAllMocks();
   });
 
-  it("should NOT split task when LLM judges same topic", async () => {
+  it("should NOT split task when classifier judges SAME topic", async () => {
     const ctx = makeCtx();
     const proc = new TaskProcessor(store, ctx);
 
-    vi.spyOn(Summarizer.prototype, "judgeNewTopic").mockResolvedValue(false);
+    vi.spyOn(Summarizer.prototype, "classifyTopic").mockResolvedValue({
+      decision: "SAME", confidence: 0.85, boundaryType: "same_direct_followup", reason: "continues deployment discussion",
+    });
 
     const now = Date.now();
     insertChunk({ id: "b1", summary: "deploy step 1", content: "deploy step 1", createdAt: now });
@@ -441,11 +445,11 @@ describe("TaskProcessor with LLM topic boundary detection", () => {
     vi.restoreAllMocks();
   });
 
-  it("should keep current task when LLM is not configured (returns null)", async () => {
+  it("should keep current task when classifier returns null (LLM not configured)", async () => {
     const ctx = makeCtx();
     const proc = new TaskProcessor(store, ctx);
 
-    vi.spyOn(Summarizer.prototype, "judgeNewTopic").mockResolvedValue(null);
+    vi.spyOn(Summarizer.prototype, "classifyTopic").mockResolvedValue(null);
 
     const now = Date.now();
     insertChunk({ id: "c1", summary: "topic A", content: "topic A", createdAt: now });
@@ -462,12 +466,68 @@ describe("TaskProcessor with LLM topic boundary detection", () => {
     vi.restoreAllMocks();
   });
 
-  it("should still split by 2-hour timeout even if LLM says same topic", async () => {
+  it("should fall back to SAME when NEW has low confidence and arbitration says SAME", async () => {
+    const ctx = makeCtx();
+    const proc = new TaskProcessor(store, ctx);
+
+    vi.spyOn(Summarizer.prototype, "classifyTopic").mockResolvedValue({
+      decision: "NEW", confidence: 0.4, boundaryType: "new_domain_shift", reason: "possibly new topic",
+    });
+    vi.spyOn(Summarizer.prototype, "arbitrateTopicSplit").mockResolvedValue("SAME");
+
+    const now = Date.now();
+    insertChunk({ id: "e1", summary: "Hong Kong stock analysis", content: "我在调研港股的前途", createdAt: now });
+    insertChunk({ id: "e2", role: "assistant", summary: "港股分析框架", content: "港股分析需要从宏观经济...", createdAt: now + 1 });
+    await proc.onChunksIngested("s1", now + 1);
+
+    const task1Id = store.getActiveTask("s1")!.id;
+
+    insertChunk({ id: "e3", summary: "processing systems", content: "那处理系统有哪些", createdAt: now + 60000 });
+    await proc.onChunksIngested("s1", now + 60000);
+
+    const task = store.getActiveTask("s1");
+    expect(task).not.toBeNull();
+    expect(task!.id).toBe(task1Id);
+
+    vi.restoreAllMocks();
+  });
+
+  it("should split when NEW has low confidence but arbitration confirms NEW", async () => {
+    const ctx = makeCtx();
+    const proc = new TaskProcessor(store, ctx);
+
+    vi.spyOn(Summarizer.prototype, "classifyTopic").mockResolvedValue({
+      decision: "NEW", confidence: 0.5, boundaryType: "new_domain_shift", reason: "different domain",
+    });
+    vi.spyOn(Summarizer.prototype, "arbitrateTopicSplit").mockResolvedValue("NEW");
+
+    const now = Date.now();
+    insertChunk({ id: "f1", summary: "deploy app", content: "deploy the app to production", createdAt: now });
+    insertChunk({ id: "f2", role: "assistant", summary: "deployment guide", content: "Here is how to deploy...", createdAt: now + 1 });
+    await proc.onChunksIngested("s1", now + 1);
+
+    const task1Id = store.getActiveTask("s1")!.id;
+
+    insertChunk({ id: "f3", summary: "cook pasta", content: "how to make spaghetti carbonara", createdAt: now + 60000 });
+    await proc.onChunksIngested("s1", now + 60000);
+
+    const oldTask = store.getTask(task1Id);
+    expect(["completed", "skipped"]).toContain(oldTask!.status);
+
+    const newTask = store.getActiveTask("s1");
+    expect(newTask).not.toBeNull();
+    expect(newTask!.id).not.toBe(task1Id);
+
+    vi.restoreAllMocks();
+  });
+
+  it("should still split by 2-hour timeout even if classifier says SAME", async () => {
     const ctx = makeCtx();
     const proc = new TaskProcessor(store, ctx);
 
-    // LLM would say SAME, but the gap is > 2h so it should split regardless
-    vi.spyOn(Summarizer.prototype, "judgeNewTopic").mockResolvedValue(false);
+    vi.spyOn(Summarizer.prototype, "classifyTopic").mockResolvedValue({
+      decision: "SAME", confidence: 0.9, boundaryType: "same_direct_followup", reason: "same topic",
+    });
 
     const now = Date.now();
     const gap = 121 * 60 * 1000; // 2h 1min