diff --git a/wwwroot/api/cockpit_agent.dspy b/wwwroot/api/cockpit_agent.dspy
index 52631fa..9e4eeec 100644
--- a/wwwroot/api/cockpit_agent.dspy
+++ b/wwwroot/api/cockpit_agent.dspy
@@ -7,21 +7,17 @@ action = (params_kw or {}).get('action', 'agent_status')
 dbname = get_module_dbname('pipeline-sdlc')
 uid = await get_user()
 org_id = await get_userorgid() or '0'
+session_id = (params_kw or {}).get('session_id', '')
 
 
-async def _get_context(sor, uid):
-    recs = await sor.sqlExe(
-        "SELECT current_project_id, current_iteration_id FROM pipeline_agent_settings WHERE user_id=${uid}$",
-        {"uid": uid})
-    if recs:
-        return {'project_id': getattr(recs[0], 'current_project_id', '') or '',
-                'iteration_id': getattr(recs[0], 'current_iteration_id', '') or ''}
-    return {'project_id': '', 'iteration_id': ''}
+async def _get_context(sor, uid, session_id=''):
+    pid, iid = await get_session_context(sor, uid, session_id)
+    return {'project_id': pid, 'iteration_id': iid}
 
 
 if action == 'start_agent':
     async with DBPools().sqlorContext(dbname) as sor:
-        ctx = await _get_context(sor, uid)
+        ctx = await _get_context(sor, uid, session_id)
         pid = ctx['project_id']
         if not pid:
             return json.dumps({"success": False, "error": "请先选择项目"}, ensure_ascii=False)
@@ -53,7 +49,7 @@ if action == 'start_agent':
 
 elif action == 'agent_status':
     async with DBPools().sqlorContext(dbname) as sor:
-        ctx = await _get_context(sor, uid)
+        ctx = await _get_context(sor, uid, session_id)
         pid = ctx['project_id']
 
         agents = []
@@ -81,7 +77,7 @@ elif action == 'agent_status':
 
 elif action == 'list_deliverables':
     async with DBPools().sqlorContext(dbname) as sor:
-        ctx = await _get_context(sor, uid)
+        ctx = await _get_context(sor, uid, session_id)
         pid = ctx['project_id']
         if not pid:
             return json.dumps([], ensure_ascii=False)
diff --git a/wwwroot/api/cockpit_chat_v2.dspy b/wwwroot/api/cockpit_chat_v2.dspy
index cac8ff3..d2689de 100644
--- a/wwwroot/api/cockpit_chat_v2.dspy
+++ b/wwwroot/api/cockpit_chat_v2.dspy
@@ -84,13 +84,10 @@ if action == 'send_message':
         uid = 'user-01'  # 测试兼容
 
     # ── 加载上下文 ──
+    session_id = (params_kw or {}).get('session_id', '')
     ctx = {'pid': '', 'name': '', 'pipeline_id': ''}
     async with DBPools().sqlorContext(dbname) as sor:
-        recs = await sor.sqlExe(
-            "SELECT current_project_id FROM pipeline_agent_settings WHERE user_id=${u}$",
-            {"u": uid})
-        if recs:
-            ctx['pid'] = getattr(recs[0], 'current_project_id', '') or ''
+        ctx['pid'], _ = await get_session_context(sor, uid, session_id)
         if ctx['pid']:
             proj_recs = await sor.sqlExe(
                 "SELECT name, pipeline_id FROM sd_projects WHERE id=${p}$", {"p": ctx['pid']})
diff --git a/wwwroot/api/cockpit_context.dspy b/wwwroot/api/cockpit_context.dspy
index e45a46c..6b47613 100644
--- a/wwwroot/api/cockpit_context.dspy
+++ b/wwwroot/api/cockpit_context.dspy
@@ -2,16 +2,10 @@
 
 import json
 uid = await get_user()
+session_id = (params_kw or {}).get('session_id', '')
 dbname = get_module_dbname('pipeline-sdlc')
 async with DBPools().sqlorContext(dbname) as sor:
-    recs = await sor.sqlExe(
-        "SELECT current_project_id, current_iteration_id FROM pipeline_agent_settings WHERE user_id=${uid}$",
-        {"uid": uid})
-    pid = ''
-    iid = ''
-    if recs and len(recs) > 0:
-        pid = getattr(recs[0], 'current_project_id', '') or ''
-        iid = getattr(recs[0], 'current_iteration_id', '') or ''
+    pid, iid = await get_session_context(sor, uid, session_id)
 
     # 拿到项目名和迭代名
     pname = ''
diff --git a/wwwroot/api/cockpit_context_update.dspy b/wwwroot/api/cockpit_context_update.dspy
index e756a00..6e285c7 100644
--- a/wwwroot/api/cockpit_context_update.dspy
+++ b/wwwroot/api/cockpit_context_update.dspy
@@ -10,6 +10,7 @@ if not uid:
 
 pid = (params_kw or {}).get('project_id', '')
 iid = (params_kw or {}).get('iteration_id', '')
+session_id = (params_kw or {}).get('session_id', '')
 
 if not pid and not iid:
     return json.dumps({"success": False, "error": "请提供 project_id 或 iteration_id"}, ensure_ascii=False)
@@ -45,6 +46,24 @@ async with DBPools().sqlorContext(dbname) as sor:
             'current_iteration_id': new_iid,
         })
 
+    # 会话级项目上下文（多 tab 隔离）：写 pipeline_session_settings
+    if session_id:
+        try:
+            await sor.sqlExe(
+                "UPDATE pipeline_session_settings SET current_project_id=${pid}$, current_iteration_id=${iid}$ "
+                "WHERE user_id=${uid}$ AND session_id=${sid}$",
+                {"pid": new_pid, "iid": new_iid, "uid": uid, "sid": session_id})
+            sexists = await sor.sqlExe(
+                "SELECT 1 FROM pipeline_session_settings WHERE user_id=${uid}$ AND session_id=${sid}$",
+                {"uid": uid, "sid": session_id})
+            if not sexists:
+                await sor.C('pipeline_session_settings', {
+                    'id': getID(), 'user_id': uid, 'session_id': session_id,
+                    'current_project_id': new_pid, 'current_iteration_id': new_iid,
+                })
+        except Exception:
+            pass
+
     # Look up names
     pname = ''
     iname = ''
diff --git a/wwwroot/api/cockpit_project_tasks.dspy b/wwwroot/api/cockpit_project_tasks.dspy
index b82776e..15ccf6f 100644
--- a/wwwroot/api/cockpit_project_tasks.dspy
+++ b/wwwroot/api/cockpit_project_tasks.dspy
@@ -10,11 +10,10 @@ if not uid:
 dbname = get_module_dbname('pipeline-sdlc')
 
 # Get current project and tasks in one session
+session_id = (params_kw or {}).get('session_id', '')
+
 async with DBPools().sqlorContext(dbname) as sor:
-    recs = await sor.sqlExe(
-        "SELECT current_project_id FROM pipeline_agent_settings WHERE user_id=${uid}$",
-        {"uid": uid})
-    pid = getattr(recs[0], 'current_project_id', '') if recs else ''
+    pid, _ = await get_session_context(sor, uid, session_id)
 
     if not pid:
         return json.dumps({"tasks": [], "error": "没有当前项目"}, ensure_ascii=False)
diff --git a/wwwroot/index.ui b/wwwroot/index.ui
index 33f52d3..5484bf4 100644
--- a/wwwroot/index.ui
+++ b/wwwroot/index.ui
@@ -1 +1 @@
-{"widgettype": "VBox", "options": {"width": "100%", "height": "100%", "padding": "0"}, "subwidgets": [{"widgettype": "HBox", "options": {"width": "100%", "alignItems": "center", "padding": "16px 24px 8px 24px", "cheight": 6, "gap": "12px"}, "subwidgets": [{"widgettype": "Title2", "options": {"text": "开发产线驾驶舱"}}, {"widgettype": "Text", "options": {"text": "AI驱动的对话式开发", "cfontsize": 0.9, "color": "#94a3b8"}}, {"widgettype": "Filler"}]}, {"widgettype": "HBox", "id": "context_bar", "options": {"width": "100%", "padding": "4px 24px 4px 24px", "cheight": 2.5, "gap": "12px", "alignItems": "center", "bgcolor": "#e8f0fe"}, "subwidgets": [{"widgettype": "Html", "options": {"html": "<script>setTimeout(function(){fetch('/pipeline-sdlc/api/cockpit_context.dspy').then(function(r){return r.json()}).then(function(d){if(d.project_id){var sel=bricks.getWidgetById('project_selector',bricks.app);if(sel)sel.setValue(d.project_id);}})},200);</script>", "height": "0", "width": "0"}}, {"widgettype": "Form", "id": "project_form", "options": {"name": "project_form", "cols": 1, "fields": [{"name": "project_id", "uitype": "code", "label": "", "placeholder": "选择项目", "cwidth": 20, "dataurl": "/pipeline-sdlc/api/cockpit_project_picker.dspy", "valueField": "value", "textField": "text", "nullable": true}]}, "binds": [{"wid": "self", "event": "changed", "actiontype": "script", "target": "self", "script": "var v=this.getValue();var pid=(v||{}).project_id||'';if(!pid)return;fetch('/pipeline-sdlc/api/cockpit_context_update.dspy',{method:'POST',headers:{'Content-Type':'application/x-www-form-urlencoded'},body:'project_id='+encodeURIComponent(pid)}).then(function(r){return r.json()}).then(function(r){if(r.success){var pl=bricks.getWidgetById('task_btn',bricks.app);if(pl&&pl.text_w)pl.text_w.set_text('任务');}})"}]}, {"widgettype": "Button", "id": "task_btn", "options": {"label": "任务", "css": "small"}, "binds": [{"wid": "self", "event": "click", "actiontype": "script", "target": "self", "script": "fetch('/pipeline-sdlc/api/cockpit_context.dspy').then(function(r){return r.json()}).then(function(d){var pid=d.project_id||'';var pn=d.project_name||'';if(!pid){var pw=new bricks.PopupWindow({title:'选择项目',cwidth:32,cheight:16,auto_open:true});var form=new bricks.Form({name:'p_picker',cols:1,fields:[{name:'project_id',uitype:'code',label:'项目',placeholder:'请选择项目',cwidth:26,dataurl:'/pipeline-sdlc/api/cockpit_project_picker.dspy',valueField:'value',textField:'text'}]});var vb=new bricks.VBox({padding:'12px',gap:'12px'});vb.add_widget(new bricks.Text({text:'请选择项目：',cfontsize:0.95,color:'#64748b'}));vb.add_widget(form);pw.content_w.add_widget(vb);setTimeout(function(){var sel=pw.content_w.dom_element.querySelector('select');if(sel)sel.addEventListener('change',function(){var v=sel.value;if(!v)return;fetch('/pipeline-sdlc/api/cockpit_context_update.dspy',{method:'POST',headers:{'Content-Type':'application/x-www-form-urlencoded'},body:'project_id='+encodeURIComponent(v)}).then(function(r){return r.json()}).then(function(r){if(r.success){pw.destroy();var sel2=bricks.getWidgetById('project_selector',bricks.app);if(sel2)sel2.setValue(r.project_id);var tb=bricks.getWidgetById('task_btn',bricks.app);if(tb&&tb.text_w)tb.text_w.set_text('\\u4efb\\u52a1');}});});},500);return;}var upw=new bricks.PopupWindow({title:pn+' - \\u4efb\\u52a1\\u5217\\u8868',cwidth:60,cheight:30,auto_open:true});var vs=new bricks.VScrollPanel({css:'filler',padding:'12px',gap:'8px'});upw.content_w.add_widget(vs);fetch('/pipeline-sdlc/api/cockpit_project_tasks.dspy').then(function(r){return r.json()}).then(function(data){var tasks=data.tasks||[];if(tasks.length===0){vs.add_widget(new bricks.Text({text:'\\u6682\\u65e0\\u4efb\\u52a1',cfontsize:0.9,color:'#94a3b8'}));return;}for(var i=0;i<tasks.length;i++){var t=tasks[i];var card=new bricks.VBox({bgcolor:'#fff',border:'1px solid #e2e8f0',borderRadius:'8px',padding:'10px 14px',gap:'4px',marginBottom:'4px'});var hdr=new bricks.HBox({alignItems:'center',gap:'8px'});var st=t.state||'';var sc='#64748b';if(st==='running')sc='#2563eb';else if(st==='completed')sc='#16a34a';else if(st==='failed')sc='#dc2626';hdr.add_widget(new bricks.Text({text:'\\u25cf',cfontsize:0.8,color:sc,fontWeight:'bold'}));hdr.add_widget(new bricks.Text({text:(t.title||'')+(t.role?' ['+t.role+']':''),cfontsize:0.95,color:'#1e293b',fontWeight:'bold'}));card.add_widget(hdr);if(t.description)card.add_widget(new bricks.Text({text:t.description,cfontsize:0.8,color:'#64748b'}));var meta=new bricks.HBox({gap:'12px'});meta.add_widget(new bricks.Text({text:'\\u72b6\\u6001:'+st,cfontsize:0.75,color:sc}));meta.add_widget(new bricks.Text({text:'v'+t.current_version,cfontsize:0.75,color:'#94a3b8'}));if(t.created_at)meta.add_widget(new bricks.Text({text:t.created_at.substring(0,16),cfontsize:0.75,color:'#94a3b8'}));card.add_widget(meta);vs.add_widget(card);}});})"}]}, {"widgettype": "Button", "id": "workspace_btn", "options": {"label": "工作空间", "css": "small"}, "binds": [{"wid": "self", "event": "click", "actiontype": "urlwidget", "target": "self", "options": {"url": "https://pipeline.opencomputing.cn/pipeline-sdlc/api/workspace_popup.dspy"}}]}], "binds": []}, {"widgettype": "AgentIO", "id": "chat_io", "options": {"css": "filler", "url": "/pipeline-sdlc/api/cockpit_chat_v2.dspy", "model_dataurl": "/pipeline-sdlc/api/cockpit_model_options.dspy", "model_cwidth": 14, "placeholder": "输入你的需求..."}}]}
\ No newline at end of file
+{"widgettype": "VBox", "options": {"width": "100%", "height": "100%", "padding": "0"}, "subwidgets": [{"widgettype": "HBox", "options": {"width": "100%", "alignItems": "center", "padding": "16px 24px 8px 24px", "cheight": 6, "gap": "12px"}, "subwidgets": [{"widgettype": "Title2", "options": {"text": "开发产线驾驶舱"}}, {"widgettype": "Text", "options": {"text": "AI驱动的对话式开发", "cfontsize": 0.9, "color": "#94a3b8"}}, {"widgettype": "Filler"}]}, {"widgettype": "HBox", "id": "context_bar", "options": {"width": "100%", "padding": "4px 24px 4px 24px", "cheight": 2.5, "gap": "12px", "alignItems": "center", "bgcolor": "#e8f0fe"}, "subwidgets": [{"widgettype": "Html", "options": {"html": "<script>setTimeout(function(){fetch('/pipeline-sdlc/api/cockpit_context.dspy?session_id='+window._sid()).then(function(r){return r.json()}).then(function(d){if(d.project_id){var sel=bricks.getWidgetById('project_selector',bricks.app);if(sel)sel.setValue(d.project_id);}})},200);</script>", "height": "0", "width": "0"}}, {"widgettype": "Form", "id": "project_form", "options": {"name": "project_form", "cols": 1, "fields": [{"name": "project_id", "uitype": "code", "label": "", "placeholder": "选择项目", "cwidth": 20, "dataurl": "/pipeline-sdlc/api/cockpit_project_picker.dspy", "valueField": "value", "textField": "text", "nullable": true}]}, "binds": [{"wid": "self", "event": "changed", "actiontype": "script", "target": "self", "script": "var v=this.getValue();var pid=(v||{}).project_id||'';if(!pid)return;fetch('/pipeline-sdlc/api/cockpit_context_update.dspy',{method:'POST',headers:{'Content-Type':'application/x-www-form-urlencoded'},body:'project_id='+encodeURIComponent(pid)+'&session_id='+encodeURIComponent(window._sid())}).then(function(r){return r.json()}).then(function(r){if(r.success){var pl=bricks.getWidgetById('task_btn',bricks.app);if(pl&&pl.text_w)pl.text_w.set_text('任务');}})"}]}, {"widgettype": "Button", "id": "task_btn", "options": {"label": "任务", "css": "small"}, "binds": [{"wid": "self", "event": "click", "actiontype": "script", "target": "self", "script": "fetch('/pipeline-sdlc/api/cockpit_context.dspy?session_id='+window._sid()).then(function(r){return r.json()}).then(function(d){var pid=d.project_id||'';var pn=d.project_name||'';if(!pid){var pw=new bricks.PopupWindow({title:'选择项目',cwidth:32,cheight:16,auto_open:true});var form=new bricks.Form({name:'p_picker',cols:1,fields:[{name:'project_id',uitype:'code',label:'项目',placeholder:'请选择项目',cwidth:26,dataurl:'/pipeline-sdlc/api/cockpit_project_picker.dspy',valueField:'value',textField:'text'}]});var vb=new bricks.VBox({padding:'12px',gap:'12px'});vb.add_widget(new bricks.Text({text:'请选择项目：',cfontsize:0.95,color:'#64748b'}));vb.add_widget(form);pw.content_w.add_widget(vb);setTimeout(function(){var sel=pw.content_w.dom_element.querySelector('select');if(sel)sel.addEventListener('change',function(){var v=sel.value;if(!v)return;fetch('/pipeline-sdlc/api/cockpit_context_update.dspy',{method:'POST',headers:{'Content-Type':'application/x-www-form-urlencoded'},body:'project_id='+encodeURIComponent(v)+'&session_id='+encodeURIComponent(window._sid())}).then(function(r){return r.json()}).then(function(r){if(r.success){pw.destroy();var sel2=bricks.getWidgetById('project_selector',bricks.app);if(sel2)sel2.setValue(r.project_id);var tb=bricks.getWidgetById('task_btn',bricks.app);if(tb&&tb.text_w)tb.text_w.set_text('\\u4efb\\u52a1');}});});},500);return;}var upw=new bricks.PopupWindow({title:pn+' - \\u4efb\\u52a1\\u5217\\u8868',cwidth:60,cheight:30,auto_open:true});var vs=new bricks.VScrollPanel({css:'filler',padding:'12px',gap:'8px'});upw.content_w.add_widget(vs);fetch('/pipeline-sdlc/api/cockpit_project_tasks.dspy?session_id='+window._sid()).then(function(r){return r.json()}).then(function(data){var tasks=data.tasks||[];if(tasks.length===0){vs.add_widget(new bricks.Text({text:'\\u6682\\u65e0\\u4efb\\u52a1',cfontsize:0.9,color:'#94a3b8'}));return;}for(var i=0;i<tasks.length;i++){var t=tasks[i];var card=new bricks.VBox({bgcolor:'#fff',border:'1px solid #e2e8f0',borderRadius:'8px',padding:'10px 14px',gap:'4px',marginBottom:'4px'});var hdr=new bricks.HBox({alignItems:'center',gap:'8px'});var st=t.state||'';var sc='#64748b';if(st==='running')sc='#2563eb';else if(st==='completed')sc='#16a34a';else if(st==='failed')sc='#dc2626';hdr.add_widget(new bricks.Text({text:'\\u25cf',cfontsize:0.8,color:sc,fontWeight:'bold'}));hdr.add_widget(new bricks.Text({text:(t.title||'')+(t.role?' ['+t.role+']':''),cfontsize:0.95,color:'#1e293b',fontWeight:'bold'}));card.add_widget(hdr);if(t.description)card.add_widget(new bricks.Text({text:t.description,cfontsize:0.8,color:'#64748b'}));var meta=new bricks.HBox({gap:'12px'});meta.add_widget(new bricks.Text({text:'\\u72b6\\u6001:'+st,cfontsize:0.75,color:sc}));meta.add_widget(new bricks.Text({text:'v'+t.current_version,cfontsize:0.75,color:'#94a3b8'}));if(t.created_at)meta.add_widget(new bricks.Text({text:t.created_at.substring(0,16),cfontsize:0.75,color:'#94a3b8'}));card.add_widget(meta);vs.add_widget(card);}});})"}]}, {"widgettype": "Button", "id": "workspace_btn", "options": {"label": "工作空间", "css": "small"}, "binds": [{"wid": "self", "event": "click", "actiontype": "script", "target": "self", "script": "var sid=window._sid?window._sid():'';var r=await fetch('/pipeline-sdlc/api/workspace_popup.dspy?session_id='+encodeURIComponent(sid));var d=await r.json();bricks.widgetBuild(d,bricks.app);"}]}], "binds": []}, {"widgettype": "AgentIO", "id": "chat_io", "options": {"css": "filler", "url": "/pipeline-sdlc/api/cockpit_chat_v2.dspy", "model_dataurl": "/pipeline-sdlc/api/cockpit_model_options.dspy", "model_cwidth": 14, "placeholder": "输入你的需求..."}}]}
\ No newline at end of file