@memtensor/memos-local-openclaw-plugin 1.0.4-beta.6 → 1.0.4-beta.8

package/index.ts

@@ -11,6 +11,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { fileURLToPath } from "url";
 import { buildContext } from "./src/config";
+import type { HostModelsConfig } from "./src/openclaw-api";
 import { ensureSqliteBinding } from "./src/storage/ensure-binding";
 import { SqliteStore } from "./src/storage/sqlite";
 import { Embedder } from "./src/embedding";
@@ -19,6 +20,10 @@ import { RecallEngine } from "./src/recall/engine";
 import { captureMessages, stripInboundMetadata } from "./src/capture";
 import { DEFAULTS } from "./src/types";
 import { ViewerServer } from "./src/viewer/server";
+import { HubServer } from "./src/hub/server";
+import { hubGetMemoryDetail, hubRequestJson, hubSearchMemories, hubSearchSkills, resolveHubClient } from "./src/client/hub";
+import { getHubStatus, connectToHub } from "./src/client/connector";
+import { fetchHubSkillBundle, publishSkillBundleToHub, restoreSkillBundleFromHub, unpublishSkillBundleFromHub } from "./src/client/skill-sync";
 import { SkillEvolver } from "./src/skill/evolver";
 import { SkillInstaller } from "./src/skill/installer";
 import { Summarizer } from "./src/ingest/providers";
@@ -173,19 +178,37 @@ const memosLocalPlugin = {
       }
     }
 
-    const pluginCfg = (api.pluginConfig ?? {}) as Record<string, unknown>;
+    let pluginCfg = (api.pluginConfig ?? {}) as Record<string, unknown>;
     const stateDir = api.resolvePath("~/.openclaw");
+
+    // Fallback: read config from file if not provided by OpenClaw
+    const configPath = path.join(stateDir, "state", "memos-local", "config.json");
+    if (Object.keys(pluginCfg).length === 0 && fs.existsSync(configPath)) {
+      try {
+        const fileConfig = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+        pluginCfg = fileConfig;
+        api.logger.info(`memos-local: loaded config from ${configPath}`);
+      } catch (e) {
+        api.logger.warn(`memos-local: failed to load config from ${configPath}: ${e}`);
+      }
+    }
+
+    // Extract host model providers so OpenClawAPIClient can proxy completion/embedding
+    const hostModels: HostModelsConfig | undefined = api.config?.models?.providers
+      ? { providers: api.config.models.providers as Record<string, import("./src/openclaw-api").HostModelProvider> }
+      : undefined;
+
     const ctx = buildContext(stateDir, process.cwd(), pluginCfg as any, {
       debug: (msg: string) => api.logger.info(`[debug] ${msg}`),
       info: (msg: string) => api.logger.info(msg),
       warn: (msg: string) => api.logger.warn(msg),
       error: (msg: string) => api.logger.warn(`[error] ${msg}`),
-    });
+    }, hostModels);
 
     ensureSqliteBinding(ctx.log);
 
     const store = new SqliteStore(ctx.config.storage!.dbPath!, ctx.log);
-    const embedder = new Embedder(ctx.config.embedding, ctx.log);
+    const embedder = new Embedder(ctx.config.embedding, ctx.log, ctx.openclawAPI);
     const worker = new IngestWorker(store, embedder, ctx);
     const engine = new RecallEngine(store, embedder, ctx);
     const evidenceTag = ctx.config.capture?.evidenceWrapperTag ?? DEFAULTS.evidenceWrapperTag;
@@ -250,7 +273,7 @@ const memosLocalPlugin = {
       });
     });
 
-    const summarizer = new Summarizer(ctx.config.summarizer, ctx.log);
+    const summarizer = new Summarizer(ctx.config.summarizer, ctx.log, ctx.openclawAPI);
 
     api.logger.info(`memos-local: initialized (db: ${ctx.config.storage!.dbPath})`);
 
@@ -303,6 +326,89 @@ 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" =>
+      target === "hub" || target === "both" ? target : "agents";
+    const resolveMemoryUnshareTarget = (target?: string): "agents" | "hub" | "all" =>
+      target === "agents" || target === "hub" ? target : "all";
+    const resolveSkillPublishTarget = (target?: string, scope?: string): "agents" | "hub" => {
+      if (target === "hub") return "hub";
+      if (target === "agents") return "agents";
+      return scope === "public" || scope === "group" ? "hub" : "agents";
+    };
+    const resolveSkillHubVisibility = (visibility?: string, scope?: string): "public" | "group" =>
+      visibility === "group" || scope === "group" ? "group" : "public";
+    const resolveSkillUnpublishTarget = (target?: string): "agents" | "hub" | "all" =>
+      target === "hub" || target === "all" ? target : "agents";
+
+    const shareMemoryToHub = async (
+      chunkId: string,
+      input?: { visibility?: "public" | "group"; groupId?: string; hubAddress?: string; userToken?: string },
+    ): Promise<{ memoryId: string; visibility: "public" | "group"; groupId: string | null }> => {
+      const chunk = store.getChunk(chunkId);
+      if (!chunk) {
+        throw new Error(`Memory not found: ${chunkId}`);
+      }
+
+      const visibility = input?.visibility === "group" ? "group" : "public";
+      const groupId = visibility === "group" ? (input?.groupId ?? null) : null;
+      const hubClient = await resolveHubClient(store, ctx, { hubAddress: input?.hubAddress, userToken: input?.userToken });
+      const response = await hubRequestJson(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/memories/share", {
+        method: "POST",
+        body: JSON.stringify({
+          memory: {
+            sourceChunkId: chunk.id,
+            role: chunk.role,
+            content: chunk.content,
+            summary: chunk.summary,
+            kind: chunk.kind,
+            groupId,
+            visibility,
+          },
+        }),
+      }) as { memoryId?: string; visibility?: "public" | "group" };
+
+      const now = Date.now();
+      const existing = store.getHubMemoryBySource(hubClient.userId, chunk.id);
+      store.upsertHubMemory({
+        id: response?.memoryId ?? existing?.id ?? `${chunk.id}-hub`,
+        sourceChunkId: chunk.id,
+        sourceUserId: hubClient.userId,
+        role: chunk.role,
+        content: chunk.content,
+        summary: chunk.summary ?? "",
+        kind: chunk.kind,
+        groupId,
+        visibility,
+        createdAt: existing?.createdAt ?? now,
+        updatedAt: now,
+      });
+
+      return {
+        memoryId: response?.memoryId ?? existing?.id ?? `${chunk.id}-hub`,
+        visibility,
+        groupId,
+      };
+    };
+
+    const unshareMemoryFromHub = async (
+      chunkId: string,
+      input?: { hubAddress?: string; userToken?: string },
+    ): Promise<void> => {
+      const chunk = store.getChunk(chunkId);
+      if (!chunk) {
+        throw new Error(`Memory not found: ${chunkId}`);
+      }
+      const hubClient = await resolveHubClient(store, ctx, { hubAddress: input?.hubAddress, userToken: input?.userToken });
+      await hubRequestJson(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/memories/unshare", {
+        method: "POST",
+        body: JSON.stringify({ sourceChunkId: chunk.id }),
+      });
+      store.deleteHubMemoryBySource(hubClient.userId, chunk.id);
+    };
+
     // ─── Tool: memory_search ───
 
     api.registerTool(
@@ -311,20 +417,43 @@ const memosLocalPlugin = {
         label: "Memory Search",
         description:
           "Search long-term conversation memory for past conversations, user preferences, decisions, and experiences. " +
-          "Relevant memories are automatically injected at the start of each turn, but call this tool when you need " +
-          "to search with a different query or the auto-recalled context is insufficient. " +
-          "Pass only a short natural-language query (2-5 key words).",
+          "Use scope='local' for this agent plus local shared memories, or scope='group'/'all' to include Hub-shared memories. " +
+          "Supports optional maxResults, minScore, and role filtering when you need tighter control.",
         parameters: Type.Object({
           query: Type.String({ description: "Short natural language search query (2-5 key words)" }),
+          scope: Type.Optional(Type.String({ description: "Search scope: 'local' (default), 'group', or 'all'. Use group/all to include Hub-shared memories." })),
+          maxResults: Type.Optional(Type.Number({ description: "Maximum results to return. Default 10, max 20." })),
+          minScore: Type.Optional(Type.Number({ description: "Minimum score threshold for local recall. Default 0.45, floor 0.35." })),
+          role: Type.Optional(Type.String({ description: "Optional local role filter: 'user', 'assistant', 'tool', or 'system'." })),
+          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) => {
-          const { query } = params as { query: string };
-          const role = undefined;
-          const minScore = undefined;
+          const {
+            query,
+            scope: rawScope,
+            maxResults,
+            minScore: rawMinScore,
+            role: rawRole,
+            hubAddress,
+            userToken,
+          } = params as {
+            query: string;
+            scope?: string;
+            maxResults?: number;
+            minScore?: number;
+            role?: string;
+            hubAddress?: string;
+            userToken?: string;
+          };
+          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;
+          const searchScope = resolveMemorySearchScope(rawScope);
+          const searchLimit = typeof maxResults === "number" ? Math.max(1, Math.min(20, Math.round(maxResults))) : 10;
 
           const agentId = currentAgentId;
-          const ownerFilter = [`agent:${agentId}`, "public"];
-          const effectiveMaxResults = 10;
+          const ownerFilter = [getCurrentOwner(), "public"];
+          const effectiveMaxResults = searchLimit;
           ctx.log.debug(`memory_search query="${query}" maxResults=${effectiveMaxResults} minScore=${minScore ?? 0.45} role=${role ?? "all"} owner=agent:${agentId}`);
           const result = await engine.search({ query, maxResults: effectiveMaxResults, minScore, role, ownerFilter });
           ctx.log.debug(`memory_search raw candidates: ${result.hits.length}`);
@@ -337,14 +466,13 @@ const memosLocalPlugin = {
             original_excerpt: (h.original_excerpt ?? "").slice(0, 200),
           }));
 
-          if (result.hits.length === 0) {
+          if (result.hits.length === 0 && searchScope === "local") {
             return {
               content: [{ type: "text", text: result.meta.note ?? "No relevant memories found." }],
               details: { candidates: [], meta: result.meta },
             };
           }
 
-          // LLM relevance + sufficiency filtering
           let filteredHits = result.hits;
           let sufficient = false;
 
@@ -362,14 +490,61 @@ const memosLocalPlugin = {
               const indexSet = new Set(filterResult.relevant);
               filteredHits = result.hits.filter((_, i) => indexSet.has(i + 1));
               ctx.log.debug(`memory_search LLM filter: ${result.hits.length} → ${filteredHits.length} hits, sufficient=${sufficient}`);
-            } else {
+            } else if (searchScope === "local") {
               return {
                 content: [{ type: "text", text: "No relevant memories found for this query." }],
                 details: { candidates: rawCandidates, filtered: [], meta: result.meta },
               };
+            } else {
+              filteredHits = [];
             }
           }
 
+          const beforeDedup = filteredHits.length;
+          filteredHits = deduplicateHits(filteredHits);
+          ctx.log.debug(`memory_search dedup: ${beforeDedup} → ${filteredHits.length}`);
+
+          const localDetailsHits = filteredHits.map((h) => {
+            let effectiveTaskId = h.taskId;
+            if (effectiveTaskId) {
+              const t = store.getTask(effectiveTaskId);
+              if (t && t.status === "skipped") effectiveTaskId = null;
+            }
+            return {
+              ref: h.ref,
+              chunkId: h.ref.chunkId,
+              taskId: effectiveTaskId,
+              skillId: h.skillId,
+              role: h.source.role,
+              score: h.score,
+              summary: h.summary,
+            };
+          });
+
+          if (searchScope !== "local") {
+            const hub = await hubSearchMemories(store, ctx, { query, maxResults: searchLimit, scope: searchScope as any, hubAddress, userToken }).catch(() => ({ hits: [], meta: { totalCandidates: 0, searchedGroups: [], includedPublic: searchScope === "all" } }));
+            const localText = filteredHits.length > 0
+              ? filteredHits.map((h, i) => {
+                  const excerpt = h.original_excerpt.length > 220 ? h.original_excerpt.slice(0, 217) + "..." : h.original_excerpt;
+                  return `${i + 1}. [${h.source.role}] ${excerpt}`;
+                }).join("\n")
+              : "(none)";
+            const hubText = hub.hits.length > 0
+              ? hub.hits.map((h, i) => `${i + 1}. [${h.ownerName}] ${h.summary}${h.groupName ? ` (${h.groupName})` : ""}`).join("\n")
+              : "(none)";
+
+            return {
+              content: [{
+                type: "text",
+                text: `Local results:\n${localText}\n\nHub results:\n${hubText}`,
+              }],
+              details: {
+                local: { hits: localDetailsHits, meta: result.meta },
+                hub,
+              },
+            };
+          }
+
           if (filteredHits.length === 0) {
             return {
               content: [{ type: "text", text: "No relevant memories found for this query." }],
@@ -377,10 +552,6 @@ const memosLocalPlugin = {
             };
           }
 
-          const beforeDedup = filteredHits.length;
-          filteredHits = deduplicateHits(filteredHits);
-          ctx.log.debug(`memory_search dedup: ${beforeDedup} → ${filteredHits.length}`);
-
           const lines = filteredHits.map((h, i) => {
             const excerpt = h.original_excerpt;
             const parts = [`${i + 1}. [${h.source.role}]`];
@@ -473,7 +644,7 @@ const memosLocalPlugin = {
           if (!anchorChunk) {
             return {
               content: [{ type: "text", text: `Chunk not found: ${chunkId}` }],
-              details: { error: "not_found" },
+              details: { error: "not_found", entries: [] },
             };
           }
 
@@ -522,7 +693,7 @@ const memosLocalPlugin = {
             Type.Number({ description: `Max chars (default ${DEFAULTS.getMaxCharsDefault}, max ${DEFAULTS.getMaxCharsMax})` }),
           ),
         }),
-        execute: trackTool("memory_get", async (_toolCallId: any, params: any) => {
+        execute: trackTool("memory_get", async (_toolCallId: any, params: any, context?: any) => {
           const { chunkId, maxChars } = params as { chunkId: string; maxChars?: number };
           const limit = Math.min(maxChars ?? DEFAULTS.getMaxCharsDefault, DEFAULTS.getMaxCharsMax);
 
@@ -629,6 +800,209 @@ const memosLocalPlugin = {
       { name: "task_summary" },
     );
 
+    // ─── Tool: task_share ───
+
+    api.registerTool(
+      {
+        name: "task_share",
+        label: "Task Share",
+        description:
+          "Share one existing local task and its chunks to the configured hub. " +
+          "Minimal MVP path for validating team task sharing.",
+        parameters: Type.Object({
+          taskId: Type.String({ description: "Local task ID to share" }),
+          visibility: Type.Optional(Type.String({ description: "Share visibility: 'public' (default) or 'group'" })),
+          groupId: Type.Optional(Type.String({ description: "Optional group ID when visibility='group'" })),
+        }),
+        execute: trackTool("task_share", async (_toolCallId: any, params: any) => {
+          const { taskId, visibility: rawVisibility, groupId } = params as {
+            taskId: string;
+            visibility?: string;
+            groupId?: string;
+          };
+
+          const task = store.getTask(taskId);
+          if (!task) {
+            return {
+              content: [{ type: "text", text: `Task not found: ${taskId}` }],
+              details: { error: "not_found", taskId },
+            };
+          }
+
+          const chunks = store.getChunksByTask(taskId);
+          if (chunks.length === 0) {
+            return {
+              content: [{ type: "text", text: `Task ${taskId} has no chunks to share.` }],
+              details: { error: "no_chunks", taskId },
+            };
+          }
+
+          const visibility = rawVisibility === "group" ? "group" : "public";
+          const hubClient = await resolveHubClient(store, ctx);
+          const { v4: uuidv4 } = require("uuid");
+          const hubTaskId = uuidv4();
+
+          const response = await hubRequestJson(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/tasks/share", {
+            method: "POST",
+            body: JSON.stringify({
+              task: {
+                id: hubTaskId,
+                sourceTaskId: task.id,
+                sourceUserId: hubClient.userId,
+                title: task.title,
+                summary: task.summary,
+                groupId: visibility === "group" ? (groupId ?? null) : null,
+                visibility,
+                createdAt: task.startedAt,
+                updatedAt: task.updatedAt,
+              },
+              chunks: chunks.map((chunk) => ({
+                id: uuidv4(),
+                hubTaskId,
+                sourceTaskId: task.id,
+                sourceChunkId: chunk.id,
+                sourceUserId: hubClient.userId,
+                role: chunk.role,
+                content: chunk.content,
+                summary: chunk.summary,
+                kind: chunk.kind,
+                createdAt: chunk.createdAt,
+              })),
+            }),
+          }) as any;
+
+          store.markTaskShared(task.id, hubTaskId, chunks.length, visibility, groupId);
+
+          return {
+            content: [{ type: "text", text: `Shared task "${task.title}" with ${chunks.length} chunks to the hub.` }],
+            details: {
+              shared: true,
+              taskId: task.id,
+              visibility,
+              chunkCount: chunks.length,
+              hubUrl: hubClient.hubUrl,
+              response,
+            },
+          };
+        }),
+      },
+      { name: "task_share" },
+    );
+
+    // ─── Tool: task_unshare ───
+
+    api.registerTool(
+      {
+        name: "task_unshare",
+        label: "Task Unshare",
+        description: "Remove one previously shared task from the configured hub.",
+        parameters: Type.Object({
+          taskId: Type.String({ description: "Local task ID to unshare" }),
+        }),
+        execute: trackTool("task_unshare", async (_toolCallId: any, params: any) => {
+          const { taskId } = params as { taskId: string };
+
+          const task = store.getTask(taskId);
+          if (!task) {
+            return {
+              content: [{ type: "text", text: `Task not found: ${taskId}` }],
+              details: { error: "not_found", taskId },
+            };
+          }
+
+          const hubClient = await resolveHubClient(store, ctx);
+          await hubRequestJson(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/tasks/unshare", {
+            method: "POST",
+            body: JSON.stringify({
+              sourceUserId: hubClient.userId,
+              sourceTaskId: task.id,
+            }),
+          });
+
+          store.unmarkTaskShared(task.id);
+
+          return {
+            content: [{ type: "text", text: `Unshared task "${task.title}" from the hub.` }],
+            details: {
+              unshared: true,
+              taskId: task.id,
+              hubUrl: hubClient.hubUrl,
+            },
+          };
+        }),
+      },
+      { name: "task_unshare" },
+    );
+
+    api.registerTool(
+      {
+        name: "network_memory_detail",
+        label: "Network Memory Detail",
+        description: "Fetch the full detail for a Hub search hit returned by memory_search(scope=group|all).",
+        parameters: Type.Object({
+          remoteHitId: Type.String({ description: "The remoteHitId returned by a Hub search hit" }),
+          hubAddress: Type.Optional(Type.String({ description: "Optional Hub address override for tests or manual routing" })),
+          userToken: Type.Optional(Type.String({ description: "Optional Hub bearer token override for tests" })),
+        }),
+        execute: trackTool("network_memory_detail", async (_toolCallId: any, params: any) => {
+          const { remoteHitId, hubAddress, userToken } = params as {
+            remoteHitId: string;
+            hubAddress?: string;
+            userToken?: string;
+          };
+
+          const detail = await hubGetMemoryDetail(store, ctx, { remoteHitId, hubAddress, userToken });
+          return {
+            content: [{
+              type: "text",
+              text: `## Shared Memory Detail
+
+${detail.summary}
+
+${detail.content}`,
+            }],
+            details: detail,
+          };
+        }),
+      },
+      { name: "network_memory_detail" },
+    );
+
+    api.registerTool(
+      {
+        name: "network_team_info",
+        label: "Network Team Info",
+        description:
+          "Show current Hub connection status, signed-in user, role, and group memberships. " +
+          "Use this as a preflight check before any Hub share/unshare or Hub pull operation.",
+        parameters: Type.Object({}),
+        execute: trackTool("network_team_info", async () => {
+          const status = await getHubStatus(store, ctx.config);
+          if (!status.connected || !status.user) {
+            return {
+              content: [{ type: "text", text: "Hub is not connected." }],
+              details: status,
+            };
+          }
+
+          const groupNames = status.user.groups.map((group) => group.name);
+          return {
+            content: [{
+              type: "text",
+              text: `## Team Connection
+
+User: ${status.user.username}
+Role: ${status.user.role}
+Hub: ${status.hubUrl ?? "(unknown)"}
+Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
+            }],
+            details: status,
+          };
+        }),
+      },
+      { name: "network_team_info" },
+    );
+
     // ─── Tool: skill_get ───
 
     api.registerTool(
@@ -776,12 +1150,13 @@ const memosLocalPlugin = {
     api.registerTool(
       {
         name: "memory_write_public",
-        label: "Write Public Memory",
+        label: "Write Local Shared Memory",
         description:
-          "Write a piece of information to public memory. Public memories are visible to all agents during memory_search. " +
-          "Use this for shared knowledge, team decisions, or cross-agent coordination information.",
+          "Write a piece of information to local shared memory for all agents in this OpenClaw workspace. " +
+          "Use this when you are creating a new shared note from scratch. This does not publish to Hub. " +
+          "If you already have a memory chunk and want to expose it, use memory_share instead.",
         parameters: Type.Object({
-          content: Type.String({ description: "The content to write to public memory" }),
+          content: Type.String({ description: "The content to write to local shared memory" }),
           summary: Type.Optional(Type.String({ description: "Optional short summary of the content" })),
         }),
         execute: trackTool("memory_write_public", async (_toolCallId: any, params: any) => {
@@ -826,7 +1201,7 @@ const memosLocalPlugin = {
           }
 
           return {
-            content: [{ type: "text", text: `Public memory written successfully (id: ${chunkId}).` }],
+            content: [{ type: "text", text: `Memory shared to local agents successfully (id: ${chunkId}).` }],
             details: { chunkId, owner: "public" },
           };
         }),
@@ -834,6 +1209,164 @@ const memosLocalPlugin = {
       { name: "memory_write_public" },
     );
 
+    api.registerTool(
+      {
+        name: "memory_share",
+        label: "Share Memory",
+        description:
+          "Share an existing memory either with local OpenClaw agents, to the Hub team, or to both targets. " +
+          "Use this only for an existing chunkId. Use target='agents' for local multi-agent sharing, target='hub' for team sharing, or target='both' for both. " +
+          "If you need to create a brand new shared memory instead of exposing an existing one, use memory_write_public.",
+        parameters: Type.Object({
+          chunkId: Type.String({ description: "Existing local memory chunk ID to share" }),
+          target: Type.Optional(Type.String({ description: "Share target: 'agents' (default), 'hub', or 'both'" })),
+          visibility: Type.Optional(Type.String({ description: "Hub visibility when target includes hub: 'public' (default) or 'group'" })),
+          groupId: Type.Optional(Type.String({ description: "Optional Hub group ID when visibility='group'" })),
+          hubAddress: Type.Optional(Type.String({ description: "Optional Hub address override" })),
+          userToken: Type.Optional(Type.String({ description: "Optional Hub bearer token override" })),
+        }),
+        execute: trackTool("memory_share", async (_toolCallId: any, params: any) => {
+          const {
+            chunkId,
+            target: rawTarget,
+            visibility: rawVisibility,
+            groupId,
+            hubAddress,
+            userToken,
+          } = params as {
+            chunkId: string;
+            target?: string;
+            visibility?: string;
+            groupId?: string;
+            hubAddress?: string;
+            userToken?: string;
+          };
+
+          const chunk = store.getChunk(chunkId);
+          if (!chunk) {
+            return { content: [{ type: "text", text: `Memory not found: ${chunkId}` }], details: { error: "not_found", chunkId } };
+          }
+
+          const target = resolveMemoryShareTarget(rawTarget);
+          const visibility = rawVisibility === "group" ? "group" : "public";
+          const details: Record<string, unknown> = { chunkId, target };
+          const messages: string[] = [];
+
+          if (target === "agents" || target === "both") {
+            const local = store.markMemorySharedLocally(chunkId);
+            if (!local.ok) {
+              return { content: [{ type: "text", text: `Failed to share memory ${chunkId} to local agents.` }], details: { error: local.reason ?? "local_share_failed", chunkId, target } };
+            }
+            details.local = {
+              shared: true,
+              owner: local.owner,
+              originalOwner: local.originalOwner ?? null,
+            };
+            messages.push("shared to local agents");
+          }
+
+          if (target === "hub" || target === "both") {
+            const hub = await shareMemoryToHub(chunkId, { visibility, groupId, hubAddress, userToken });
+            details.hub = {
+              shared: true,
+              memoryId: hub.memoryId,
+              visibility: hub.visibility,
+              groupId: hub.groupId,
+            };
+            messages.push(`shared to Hub (${hub.visibility})`);
+          }
+
+          return {
+            content: [{ type: "text", text: `Memory "${chunk.summary || chunk.id}" ${messages.join(" and ")}.` }],
+            details,
+          };
+        }),
+      },
+      { name: "memory_share" },
+    );
+
+    api.registerTool(
+      {
+        name: "memory_unshare",
+        label: "Unshare Memory",
+        description:
+          "Remove sharing from an existing memory. Use target='agents' to stop local multi-agent sharing, target='hub' to remove it from Hub, or target='all' (default) to remove both. " +
+          "privateOwner is only needed for older public memories that were never tracked with an original owner.",
+        parameters: Type.Object({
+          chunkId: Type.String({ description: "Existing local memory chunk ID to unshare" }),
+          target: Type.Optional(Type.String({ description: "Unshare target: 'agents', 'hub', or 'all' (default)" })),
+          privateOwner: Type.Optional(Type.String({ description: "Optional owner to restore when converting a public memory back to private and no original owner was tracked" })),
+          hubAddress: Type.Optional(Type.String({ description: "Optional Hub address override" })),
+          userToken: Type.Optional(Type.String({ description: "Optional Hub bearer token override" })),
+        }),
+        execute: trackTool("memory_unshare", async (_toolCallId: any, params: any) => {
+          const {
+            chunkId,
+            target: rawTarget,
+            privateOwner,
+            hubAddress,
+            userToken,
+          } = params as {
+            chunkId: string;
+            target?: string;
+            privateOwner?: string;
+            hubAddress?: string;
+            userToken?: string;
+          };
+
+          const chunk = store.getChunk(chunkId);
+          if (!chunk) {
+            return { content: [{ type: "text", text: `Memory not found: ${chunkId}` }], details: { error: "not_found", chunkId } };
+          }
+
+          const target = resolveMemoryUnshareTarget(rawTarget);
+          const details: Record<string, unknown> = { chunkId, target };
+          const messages: string[] = [];
+
+          if (target === "agents" || target === "all") {
+            const local = store.unmarkMemorySharedLocally(chunkId, privateOwner);
+            if (!local.ok) {
+              return {
+                content: [{
+                  type: "text",
+                  text: local.reason === "original_owner_missing"
+                    ? `Cannot restore memory "${chunk.summary || chunk.id}" to a private owner automatically. Pass privateOwner to unshare it locally.`
+                    : `Failed to stop local sharing for memory ${chunkId}.`,
+                }],
+                details: { error: local.reason ?? "local_unshare_failed", chunkId, target },
+              };
+            }
+            details.local = {
+              shared: false,
+              owner: local.owner,
+            };
+            messages.push("removed from local agent sharing");
+          }
+
+          if (target === "hub" || target === "all") {
+            try {
+              await unshareMemoryFromHub(chunkId, { hubAddress, userToken });
+              details.hub = { shared: false };
+              messages.push("removed from Hub");
+            } catch (err) {
+              const msg = err instanceof Error ? err.message : String(err);
+              if (target === "all" && msg.includes("hub client connection is not configured")) {
+                details.hub = { shared: false, skipped: true, reason: "hub_not_configured" };
+              } else {
+                throw err;
+              }
+            }
+          }
+
+          return {
+            content: [{ type: "text", text: `Memory "${chunk.summary || chunk.id}" ${messages.join(" and ")}.` }],
+            details,
+          };
+        }),
+      },
+      { name: "memory_unshare" },
+    );
+
     // ─── Tool: skill_search ───
 
     api.registerTool(
@@ -841,16 +1374,42 @@ const memosLocalPlugin = {
         name: "skill_search",
         label: "Skill Search",
         description:
-          "Search available skills by natural language. Searches your own skills, public skills, or both. " +
-          "Use when you need a capability or guide and don't have a matching skill at hand.",
+          "Search available skills by natural language. Use scope='mix' (default) for this agent plus local shared skills, 'self' for this agent only, 'public' for local shared skills only, or 'group'/'all' to include Hub skills as well. " +
+          "Use this when you need a capability or guide and don't have a matching skill at hand.",
         parameters: Type.Object({
           query: Type.String({ description: "Natural language description of the needed skill" }),
-          scope: Type.Optional(Type.String({ description: "Search scope: 'mix' (default, self + public), 'self' (own only), 'public' (public only)" })),
+          scope: Type.Optional(Type.String({ description: "Search scope: 'mix' (default), 'self', 'public', 'group', or 'all'." })),
         }),
-        execute: trackTool("skill_search", async (_toolCallId: any, params: any) => {
+        execute: trackTool("skill_search", async (_toolCallId: any, params: any, context?: any) => {
           const { query: skillQuery, scope: rawScope } = params as { query: string; scope?: string };
           const scope = (rawScope === "self" || rawScope === "public") ? rawScope : "mix";
-          const currentOwner = `agent:${currentAgentId}`;
+          const currentOwner = getCurrentOwner();
+
+          if (rawScope === "group" || rawScope === "all") {
+            const [localHits, hub] = await Promise.all([
+              engine.searchSkills(skillQuery, "mix" as any, currentOwner),
+              hubSearchSkills(store, ctx, { query: skillQuery, maxResults: 10 }).catch(() => ({ hits: [] })),
+            ]);
+
+            if (localHits.length === 0 && hub.hits.length === 0) {
+              return {
+                content: [{ type: "text", text: `No relevant skills found for: "${skillQuery}" (scope: ${rawScope})` }],
+                details: { query: skillQuery, scope: rawScope, local: { hits: [] }, hub },
+              };
+            }
+
+            const localText = localHits.length > 0
+              ? localHits.map((h, i) => `${i + 1}. [${h.name}] ${h.description.slice(0, 150)}${h.visibility === "public" ? " (shared to local agents)" : ""}`).join("\n")
+              : "(none)";
+            const hubText = hub.hits.length > 0
+              ? hub.hits.map((h, i) => `${i + 1}. [${h.name}] ${h.description.slice(0, 150)} (${h.visibility}${h.groupName ? `:${h.groupName}` : ""}, owner=${h.ownerName})`).join("\n")
+              : "(none)";
+
+            return {
+              content: [{ type: "text", text: `Local skills:\n${localText}\n\nHub skills:\n${hubText}` }],
+              details: { query: skillQuery, scope: rawScope, local: { hits: localHits }, hub },
+            };
+          }
 
           const hits = await engine.searchSkills(skillQuery, scope as any, currentOwner);
 
@@ -862,7 +1421,7 @@ const memosLocalPlugin = {
           }
 
           const text = hits.map((h, i) =>
-            `${i + 1}. [${h.name}] ${h.description}${h.visibility === "public" ? " (public)" : ""}`,
+            `${i + 1}. [${h.name}] ${h.description}${h.visibility === "public" ? " (shared to local agents)" : ""}`,
           ).join("\n");
 
           return {
@@ -880,20 +1439,54 @@ const memosLocalPlugin = {
       {
         name: "skill_publish",
         label: "Publish Skill",
-        description: "Make a skill public so other agents can discover and install it via skill_search.",
+        description:
+          "Share a skill with local agents or publish it to the Hub. " +
+          "Use target='agents' for local sharing, or target='hub' with visibility='public'/'group' for Hub publishing. " +
+          "The old scope parameter is still accepted for backward compatibility.",
         parameters: Type.Object({
           skillId: Type.String({ description: "The skill ID to publish" }),
+          target: Type.Optional(Type.String({ description: "Publish target: 'agents' (default) or 'hub'." })),
+          visibility: Type.Optional(Type.String({ description: "Hub visibility when target='hub': 'public' (default) or 'group'." })),
+          scope: Type.Optional(Type.String({ description: "Deprecated alias: omit for local agents, or use 'public' / 'group' to publish to Hub." })),
+          groupId: Type.Optional(Type.String({ description: "Optional group ID when scope='group'" })),
+          hubAddress: Type.Optional(Type.String({ description: "Optional Hub address override for tests or manual routing" })),
+          userToken: Type.Optional(Type.String({ description: "Optional Hub bearer token override for tests" })),
         }),
         execute: trackTool("skill_publish", async (_toolCallId: any, params: any) => {
-          const { skillId: pubSkillId } = params as { skillId: string };
+          const {
+            skillId: pubSkillId,
+            target: rawTarget,
+            visibility: rawVisibility,
+            scope,
+            groupId,
+            hubAddress,
+            userToken,
+          } = params as {
+            skillId: string;
+            target?: string;
+            visibility?: string;
+            scope?: string;
+            groupId?: string;
+            hubAddress?: string;
+            userToken?: string;
+          };
           const skill = store.getSkill(pubSkillId);
           if (!skill) {
             return { content: [{ type: "text", text: `Skill not found: ${pubSkillId}` }] };
           }
+          const target = resolveSkillPublishTarget(rawTarget, scope);
+          const visibility = resolveSkillHubVisibility(rawVisibility, scope);
+          if (target === "hub") {
+            const published = await publishSkillBundleToHub(store, ctx, { skillId: pubSkillId, visibility, groupId, hubAddress, userToken });
+            return {
+              content: [{ type: "text", text: `Skill "${skill.name}" shared to Hub (${published.visibility}).` }],
+              details: { skillId: pubSkillId, name: skill.name, target, publishedToHub: true, hubSkillId: published.skillId, visibility: published.visibility },
+            };
+          }
           store.setSkillVisibility(pubSkillId, "public");
           return {
-            content: [{ type: "text", text: `Skill "${skill.name}" is now public.` }],
-            details: { skillId: pubSkillId, name: skill.name, visibility: "public" },
+            content: [{ type: "text", text: `Skill "${skill.name}" is now shared with local agents.` }],
+            details: { skillId: pubSkillId, name: skill.name, target, visibility: "public", publishedToHub: false },
           };
         }),
       },
@@ -906,26 +1499,75 @@ const memosLocalPlugin = {
       {
         name: "skill_unpublish",
         label: "Unpublish Skill",
-        description: "Make a skill private. Other agents will no longer be able to discover it.",
+        description:
+          "Stop sharing a skill with local agents, remove it from the Hub, or do both. " +
+          "Use target='agents' (default), 'hub', or 'all'.",
         parameters: Type.Object({
           skillId: Type.String({ description: "The skill ID to unpublish" }),
+          target: Type.Optional(Type.String({ description: "Unpublish target: 'agents' (default), 'hub', or 'all'." })),
+          hubAddress: Type.Optional(Type.String({ description: "Optional Hub address override for tests or manual routing" })),
+          userToken: Type.Optional(Type.String({ description: "Optional Hub bearer token override for tests" })),
         }),
         execute: trackTool("skill_unpublish", async (_toolCallId: any, params: any) => {
-          const { skillId: unpubSkillId } = params as { skillId: string };
+          const { skillId: unpubSkillId, target, hubAddress, userToken } = params as { skillId: string; target?: string; hubAddress?: string; userToken?: string };
           const skill = store.getSkill(unpubSkillId);
           if (!skill) {
             return { content: [{ type: "text", text: `Skill not found: ${unpubSkillId}` }] };
           }
-          store.setSkillVisibility(unpubSkillId, "private");
+          const resolvedTarget = resolveSkillUnpublishTarget(target);
+          const messages: string[] = [];
+          const details: Record<string, unknown> = { skillId: unpubSkillId, name: skill.name, target: resolvedTarget };
+          if (resolvedTarget === "hub" || resolvedTarget === "all") {
+            try {
+              await unpublishSkillBundleFromHub(store, ctx, { skillId: unpubSkillId, hubAddress, userToken });
+              details.hub = { unpublished: true };
+              messages.push("removed from Hub sharing");
+            } catch (err) {
+              const msg = err instanceof Error ? err.message : String(err);
+              if (resolvedTarget === "all" && msg.includes("hub client connection is not configured")) {
+                details.hub = { unpublished: false, skipped: true, reason: "hub_not_configured" };
+              } else {
+                throw err;
+              }
+            }
+          }
+          if (resolvedTarget === "agents" || resolvedTarget === "all") {
+            store.setSkillVisibility(unpubSkillId, "private");
+            details.local = { visibility: "private" };
+            messages.push("limited to this agent");
+          }
           return {
-            content: [{ type: "text", text: `Skill "${skill.name}" is now private.` }],
-            details: { skillId: unpubSkillId, name: skill.name, visibility: "private" },
+            content: [{ type: "text", text: `Skill "${skill.name}" ${messages.join(" and ")}.` }],
+            details,
           };
         }),
       },
       { name: "skill_unpublish" },
     );
 
+    api.registerTool(
+      {
+        name: "network_skill_pull",
+        label: "Network Skill Pull",
+        description: "Download a published Hub skill bundle and restore it into local managed skills.",
+        parameters: Type.Object({
+          skillId: Type.String({ description: "The Hub skill ID to pull" }),
+          hubAddress: Type.Optional(Type.String({ description: "Optional Hub address override for tests or manual routing" })),
+          userToken: Type.Optional(Type.String({ description: "Optional Hub bearer token override for tests" })),
+        }),
+        execute: trackTool("network_skill_pull", async (_toolCallId: any, params: any) => {
+          const { skillId, hubAddress, userToken } = params as { skillId: string; hubAddress?: string; userToken?: string };
+          const payload = await fetchHubSkillBundle(store, ctx, { skillId, hubAddress, userToken });
+          const restored = restoreSkillBundleFromHub(store, ctx, payload);
+          return {
+            content: [{ type: "text", text: `Pulled Hub skill "${restored.localName}" into local storage.` }],
+            details: { pulled: true, hubSkillId: skillId, localSkillId: restored.localSkillId, localName: restored.localName, dirPath: restored.dirPath },
+          };
+        }),
+      },
+      { name: "network_skill_pull" },
+    );
+
     // ─── Auto-recall: inject relevant memories before agent starts ───
 
     api.on("before_agent_start", async (event: { prompt?: string; messages?: unknown[] }, hookCtx?: { agentId?: string; sessionKey?: string }) => {
@@ -1231,11 +1873,74 @@ const memosLocalPlugin = {
           worker.enqueue(captured);
           telemetry.trackMemoryIngested(captured.length);
         }
+
+        // Incremental push: sync new chunks for already-shared tasks
+        syncSharedTasksIncremental().catch((err) => {
+          ctx.log.warn(`incremental sync failed: ${err}`);
+        });
       } catch (err) {
         api.logger.warn(`memos-local: capture failed: ${String(err)}`);
       }
     });
 
+    async function syncSharedTasksIncremental(): Promise<void> {
+      if (!ctx.config.sharing?.enabled || ctx.config.sharing.role !== "client") return;
+      const shared = store.listLocalSharedTasks();
+      if (shared.length === 0) return;
+
+      let hubClient: { hubUrl: string; userToken: string; userId: string } | undefined;
+      try {
+        hubClient = await resolveHubClient(store, ctx);
+      } catch {
+        return;
+      }
+      const { v4: uuidv4 } = require("uuid");
+
+      for (const entry of shared) {
+        const task = store.getTask(entry.taskId);
+        if (!task) continue;
+        const chunks = store.getChunksByTask(entry.taskId);
+        if (chunks.length <= entry.syncedChunks) continue;
+
+        const newChunks = chunks.slice(entry.syncedChunks);
+        ctx.log.info(`incremental sync: task=${entry.taskId} pushing ${newChunks.length} new chunk(s)`);
+
+        try {
+          await hubRequestJson(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/tasks/share", {
+            method: "POST",
+            body: JSON.stringify({
+              task: {
+                id: entry.hubTaskId,
+                sourceTaskId: entry.taskId,
+                sourceUserId: hubClient.userId,
+                title: task.title,
+                summary: task.summary,
+                groupId: entry.visibility === "group" ? entry.groupId ?? null : null,
+                visibility: entry.visibility,
+                createdAt: task.startedAt ?? task.updatedAt ?? Date.now(),
+                updatedAt: task.updatedAt ?? Date.now(),
+              },
+              chunks: newChunks.map((chunk) => ({
+                id: uuidv4(),
+                hubTaskId: entry.hubTaskId,
+                sourceTaskId: entry.taskId,
+                sourceChunkId: chunk.id,
+                sourceUserId: hubClient.userId,
+                role: chunk.role,
+                content: chunk.content,
+                summary: chunk.summary,
+                kind: chunk.kind,
+                createdAt: chunk.createdAt,
+              })),
+            }),
+          });
+          store.markTaskShared(entry.taskId, entry.hubTaskId, chunks.length, entry.visibility, entry.groupId);
+        } catch (err) {
+          ctx.log.warn(`incremental sync failed for task=${entry.taskId}: ${err}`);
+        }
+      }
+    }
+
     // ─── Memory Viewer (web UI) ───
 
     const viewer = new ViewerServer({
@@ -1247,11 +1952,30 @@ const memosLocalPlugin = {
       ctx,
     });
 
+    const hubServer = ctx.config.sharing?.enabled && ctx.config.sharing.role === "hub"
+      ? new HubServer({ store, log: ctx.log, config: ctx.config, dataDir: stateDir, embedder })
+      : null;
+
     // ─── 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}`);
+        }
+
+        // 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}`);
+          }
+        }
+
         try {
           const viewerUrl = await viewer.start();
           api.logger.info(`memos-local: started (embedding: ${embedder.provider})`);
@@ -1277,7 +2001,9 @@ const memosLocalPlugin = {
         );
       },
       stop: async () => {
+        await worker.flush();
         await telemetry.shutdown();
+        await hubServer?.stop();
         viewer.stop();
         store.close();
         api.logger.info("memos-local: stopped");