@memtensor/memos-local-openclaw-plugin 1.0.4-beta.13 → 1.0.4-beta.15

package/index.ts

@@ -466,7 +466,10 @@ 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;
-          const searchScope = resolveMemorySearchScope(rawScope);
+          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 = currentAgentId;
@@ -1818,6 +1821,38 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
         ctx.log.debug(`auto-recall: query="${query.slice(0, 80)}"`);
 
         const result = await engine.search({ query, maxResults: 10, minScore: 0.45, ownerFilter: recallOwnerFilter });
+
+        // Hub fallback helper: search team shared memories when local search has no relevant results
+        const hubFallback = async (): Promise<SearchHit[]> => {
+          if (!ctx.config?.sharing?.enabled) return [];
+          try {
+            const hubResult = await hubSearchMemories(store, ctx, { query, maxResults: 10, scope: "all" });
+            if (hubResult.hits.length === 0) return [];
+            ctx.log.debug(`auto-recall: hub fallback returned ${hubResult.hits.length} hit(s)`);
+            return hubResult.hits.map((h) => ({
+              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, sessionKey: "" },
+            }));
+          } catch (err) {
+            ctx.log.debug(`auto-recall: hub fallback failed (${err})`);
+            return [];
+          }
+        };
+
+        if (result.hits.length === 0) {
+          // Local found nothing — try hub before giving up
+          const hubHits = await hubFallback();
+          if (hubHits.length > 0) {
+            result.hits.push(...hubHits);
+            ctx.log.debug(`auto-recall: local empty, using ${hubHits.length} hub hit(s)`);
+          }
+        }
         if (result.hits.length === 0) {
           ctx.log.debug("auto-recall: no memory candidates found");
           const dur = performance.now() - recallT0;
@@ -1881,22 +1916,36 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
             const indexSet = new Set(filterResult.relevant);
             filteredHits = result.hits.filter((_, i) => indexSet.has(i + 1));
           } else {
-            ctx.log.debug("auto-recall: LLM filter returned no relevant hits");
-            const dur = performance.now() - recallT0;
-            store.recordToolCall("memory_search", dur, true);
-            store.recordApiLog("memory_search", { type: "auto_recall", query }, JSON.stringify({
-              candidates: result.hits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt, origin: h.origin || "local" })),
-              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 };
+            ctx.log.debug("auto-recall: LLM filter returned no relevant local hits, trying hub fallback");
+            const hubHits = await hubFallback();
+            if (hubHits.length > 0) {
+              ctx.log.debug(`auto-recall: hub fallback provided ${hubHits.length} hit(s) after local filter yielded 0`);
+              filteredHits = hubHits;
+            } else {
+              const dur = performance.now() - recallT0;
+              store.recordToolCall("memory_search", dur, true);
+              store.recordApiLog("memory_search", { type: "auto_recall", query }, JSON.stringify({
+                candidates: result.hits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt, origin: h.origin || "local" })),
+                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;
             }
-            return;
+          }
+        }
+
+        if (!sufficient && filteredHits.length > 0 && ctx.config?.sharing?.enabled) {
+          const hubSupp = await hubFallback();
+          if (hubSupp.length > 0) {
+            ctx.log.debug(`auto-recall: local insufficient, supplementing with ${hubSupp.length} hub hit(s)`);
+            filteredHits.push(...hubSupp);
           }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memtensor/memos-local-openclaw-plugin",
-  "version": "1.0.4-beta.13",
+  "version": "1.0.4-beta.15",
   "description": "MemOS Local memory plugin for OpenClaw — full-write, hybrid-recall, progressive retrieval",
   "type": "module",
   "main": "index.ts",

package/src/config.ts

@@ -128,7 +128,8 @@ export function resolveConfig(raw: Partial<MemosLocalConfig> | undefined, stateD
         userToken: cfg.sharing?.client?.userToken ?? "",
         teamToken: cfg.sharing?.client?.teamToken ?? "",
         pendingUserId: cfg.sharing?.client?.pendingUserId ?? "",
-      } : { hubAddress: "", userToken: "", teamToken: "", pendingUserId: "" };
+        nickname: cfg.sharing?.client?.nickname ?? "",
+      } : { hubAddress: "", userToken: "", teamToken: "", pendingUserId: "", nickname: "" };
       return { enabled, role, hub, client, capabilities: sharingCapabilities };
     })(),
   };

package/src/hub/server.ts

@@ -314,6 +314,7 @@ export class HubServer {
           { userId: user.id, username: user.username, role: user.role, status: user.status },
           this.authSecret,
         );
+        this.userManager.approveUser(user.id, token);
         return this.json(res, 200, { status: "active", userToken: token });
       }
       return this.json(res, 200, { status: user.status });

package/src/storage/sqlite.ts

@@ -1490,7 +1490,10 @@ export class SqliteStore {
     const conditions: string[] = [];
     const params: unknown[] = [];
     if (opts.status) { conditions.push("status = ?"); params.push(opts.status); }
-    if (opts.owner) { conditions.push("owner = ?"); params.push(opts.owner); }
+    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);
+    }
     const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 
     const countRow = this.db.prepare(`SELECT COUNT(*) as c FROM tasks ${whereClause}`).get(...params) as { c: number };

package/src/viewer/html.ts

@@ -3599,14 +3599,16 @@ function selectSharingRole(role){
   var tp=document.getElementById('sharingTeamPanel');
   var ap=document.getElementById('sharingAdminPanel');
   if(role==='client'){
-    if(sp) sp.style.display='none';
+    if(sp) { sp.style.display='none'; sp.innerHTML=''; }
     if(tp) tp.style.display='none';
     if(ap) ap.style.display='none';
   }else{
-    if(sp) sp.style.display='';
+    if(sp) { sp.style.display='none'; sp.innerHTML=''; }
     if(tp) tp.style.display='';
     if(ap) ap.style.display='';
   }
+  _lastSettingsFingerprint='';
+  setTimeout(function(){ loadSharingStatus(true); },200);
   if(role==='hub'){
     var tk=document.getElementById('cfgHubTeamToken');
     if(!tk.value.trim()) tk.value=_genToken(18);
@@ -3719,6 +3721,7 @@ function switchView(view){
 
 function onMemoryScopeChange(){
   memorySearchScope=document.getElementById('memorySearchScope')?.value||'local';
+  try{localStorage.setItem('memos_memorySearchScope',memorySearchScope);}catch(e){}
   currentPage=1;
   activeSession=null;activeRole='';
   _lastMemoriesFingerprint='';
@@ -3844,6 +3847,7 @@ function renderSharingSidebar(data){
     html+='<span class="label">'+t('sharing.sidebar.identity')+'</span><span class="value">'+esc(conn.user.username||'-')+'</span>';
     if(conn.teamName) html+='<span class="label">'+t('sharing.team')+'</span><span class="value">'+esc(conn.teamName)+'</span>';
     html+='</div>';
+    html+='<div style="margin-top:8px"><button class="btn btn-sm btn-primary" onclick="retryHubJoin()" style="font-size:11px">'+t('sharing.retryJoin')+'</button></div>';
     statusEl.innerHTML=html;
     hintEl.textContent=t('sharing.rejected.hint');
   }else if(conn.removed&&conn.user){
@@ -3852,6 +3856,7 @@ function renderSharingSidebar(data){
     html+='<span class="label">'+t('sharing.sidebar.identity')+'</span><span class="value">'+esc(conn.user.username||'-')+'</span>';
     if(conn.teamName) html+='<span class="label">'+t('sharing.team')+'</span><span class="value">'+esc(conn.teamName)+'</span>';
     html+='</div>';
+    html+='<div style="margin-top:8px"><button class="btn btn-sm btn-primary" onclick="retryHubJoin()" style="font-size:11px">'+t('sharing.retryJoin')+'</button></div>';
     statusEl.innerHTML=html;
     hintEl.textContent=t('sharing.removed.hint');
   }else if(conn.connected&&conn.user){
@@ -3888,6 +3893,9 @@ function renderSharingSettings(data){
   if(!data||!data.enabled){
     statusEl.innerHTML='';teamEl.innerHTML='';adminEl.innerHTML='';
     if(panelsWrap) panelsWrap.style.display='none';
+    var adminNavTab0=document.querySelector('.tab[data-view="admin"]');
+    if(adminNavTab0) adminNavTab0.style.display='none';
+    if(_activeView==='admin') switchView('memories');
     return;
   }
   if(panelsWrap) panelsWrap.style.display='';
@@ -3895,9 +3903,20 @@ function renderSharingSettings(data){
   var user=conn.user||{};
   var actualRole=data.role||_sharingRole||'client';
   if(data.role) _sharingRole=data.role;
+  var prevIsAdmin=!!window._isHubAdmin;
   var isAdmin=(data.admin&&data.admin.canManageUsers)||(conn.connected&&user.role==='admin')||(actualRole==='hub');
   window._isHubAdmin=isAdmin;
   if(isAdmin) startAdminPoll();
+  var adminNavTab=document.querySelector('.tab[data-view="admin"]');
+  if(adminNavTab){
+    var showTab=(actualRole==='hub')||(conn.connected);
+    adminNavTab.style.display=showTab?'':'none';
+    if(!showTab&&_activeView==='admin') switchView('memories');
+  }
+  if(prevIsAdmin&&!isAdmin&&_activeView==='admin'){
+    _lastAdminFingerprint='';
+    loadAdminData();
+  }
   var hubAdminBtn=document.getElementById('hubAdminEntryBtn');
 
   if(actualRole==='hub'){
@@ -4418,7 +4437,14 @@ async function adminToggleRole(userId,newRole){
   try{
     var r=await fetch('/api/sharing/change-role',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId,role:newRole})});
     var d=await r.json();
-    if(d.ok){toast(t('toast.roleChanged'),'success');_lastAdminFingerprint='';loadAdminData();}
+    if(d.ok){
+      toast(t('toast.roleChanged'),'success');
+      _lastAdminFingerprint='';
+      _lastSettingsFingerprint='';
+      _lastSidebarFingerprint='';
+      await loadSharingStatus(false);
+      loadAdminData();
+    }
     else if(d.error==='cannot_demote_owner'){toast(t('admin.ownerHint'),'error');}
     else{toast(d.error||t('toast.roleChangeFail'),'error');}
   }catch(e){toast(t('toast.roleChangeFail')+': '+e.message,'error');}
@@ -8840,6 +8866,14 @@ async function checkForUpdate(){
 }
 
 /* ─── Init ─── */
+try{
+  var savedScope=localStorage.getItem('memos_memorySearchScope');
+  if(savedScope&&(savedScope==='local'||savedScope==='allLocal'||savedScope==='hub')){
+    memorySearchScope=savedScope;
+    var scopeEl=document.getElementById('memorySearchScope');
+    if(scopeEl) scopeEl.value=savedScope;
+  }
+}catch(e){}
 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();