@memtensor/memos-local-openclaw-plugin 1.0.8-beta.3 → 1.0.8-beta.5

package/index.ts

@@ -2339,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();
@@ -2390,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);
   },
 };
 

package/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.8-beta.2",
+  "version": "1.0.8-beta.5",
   "skills": [
     "skill/memos-memory-guide"
   ],

package/package.json

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

package/src/hub/server.ts

@@ -714,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]);
@@ -739,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>();

package/src/storage/sqlite.ts

@@ -2724,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();

package/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)}
@@ -389,6 +390,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .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}
+.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}
@@ -1818,7 +1820,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
               </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">
+                <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>
@@ -1901,18 +1903,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">
@@ -1945,7 +1949,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>
@@ -5352,6 +5356,42 @@ 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}:session:{sessionId} → shortened sessionId
+    if(parts.length>=4 && parts[2]==='session'){
+      var sessId=parts.slice(3).join(':');
+      return sessId.length>12?sessId.slice(0,6)+'..'+sessId.slice(-4):sessId;
+    }
+    // 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 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){
@@ -5494,9 +5534,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);
   });
@@ -5513,7 +5553,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');}
 }
 
@@ -5522,7 +5562,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');}
 }
 
@@ -7414,7 +7454,7 @@ async function saveGeneralConfig(){
   const vp=document.getElementById('cfgViewerPort').value.trim();
   if(vp) cfg.viewerPort=Number(vp);
   const tafh=document.getElementById('cfgTaskAutoFinalizeHours').value.trim();
-  cfg.taskAutoFinalizeHours=tafh!==''?Number(tafh):4;
+  cfg.taskAutoFinalizeHours=tafh!==''?Math.max(0,Number(tafh)):4;
   cfg.telemetry={enabled:document.getElementById('cfgTelemetryEnabled').checked};
 
   await doSaveConfig(cfg, saveBtn, 'generalSaved');
@@ -8606,7 +8646,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>':'';
@@ -8614,7 +8654,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';
@@ -8648,8 +8688,10 @@ 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-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" title="'+esc(sid)+'">'+esc(sidShort)+'</span> '+time+updatedAt+'</span></div>'+
       '<div class="card-summary">'+selectBoxHtml+cardTitle+'</div>'+
       (function(){
         if(mc<=0) return '';
@@ -8789,6 +8831,7 @@ 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.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>';
@@ -8966,7 +9009,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';
@@ -8999,8 +9042,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{
@@ -9053,11 +9095,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='';
@@ -9142,7 +9183,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;
@@ -9262,7 +9303,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{

package/src/viewer/server.ts

@@ -622,6 +622,7 @@ export class ViewerServer {
     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,
@@ -633,7 +634,7 @@ 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,
       };
     });
 
@@ -737,6 +738,8 @@ export class ViewerServer {
       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,
@@ -744,6 +747,7 @@ export class ViewerServer {
         chunkCount: this.store.countChunksByTask(t.id),
         skillStatus: meta?.skill_status ?? null,
         owner: meta?.owner ?? "agent:main",
+        sharingVisibility: ts.visibility,
         score,
       };
     }).filter(Boolean);
@@ -780,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,
@@ -794,9 +799,9 @@ 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,
     });
   }
 
@@ -1616,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) {
@@ -1676,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}`); }
         }
@@ -1689,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}`); }
           }
@@ -1816,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;
@@ -3982,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(
@@ -4195,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,
@@ -4295,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",
@@ -4450,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;
@@ -4702,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[] = [];