@wendongfly/myhi 1.3.193 → 1.3.195

package/dist/chat.html

@@ -294,6 +294,12 @@
     @media (pointer: coarse) { #cmd-input { font-size: 1rem; padding: 0.75rem 0.75rem 0.35rem; line-height: 1.55; } }
     #input-toolbar { display: flex; align-items: center; padding: 0.25rem 0.4rem 0.4rem; gap: 0.15rem; }
     #input-toolbar .spacer { flex: 1; }
+    .inj-btn { flex-shrink: 0; height: 30px; border: 1px solid var(--yellow); background: rgba(210,153,34,0.12); color: var(--yellow); border-radius: 8px; padding: 0 0.6rem; font-size: 0.76rem; font-weight: 600; cursor: pointer; white-space: nowrap; align-self: center; }
+    .inj-btn:hover { background: rgba(210,153,34,0.22); }
+    .inj-tag { font-size: 0.66rem; margin-right: 0.35rem; color: var(--yellow); }
+    .inj-tag.seen { color: var(--green); }
+    .inj-tag.dropped { color: var(--red); }
+    .msg-inject .bubble { border: 1px dashed var(--yellow); }
     .tb-btn { display: inline-flex; align-items: center; justify-content: center; width: 32px; height: 32px; border-radius: 8px; border: none; background: transparent; color: var(--muted); cursor: pointer; transition: all 0.15s; flex-shrink: 0; }
     .tb-btn:hover { background: var(--surface2); color: var(--text); }
     .tb-btn:active { transform: scale(0.92); }
@@ -448,6 +454,119 @@
     .dr-btn.take { background: var(--green); color: #fff; font-weight: 600; }
     .dr-btn:active { opacity: 0.75; }
     .dr-src { color: var(--blue2); }
+    /* 技能面板 */
+    .skl-box { max-width: 640px !important; max-height: min(88vh, 820px); min-height: min(460px, 80vh); display: flex; flex-direction: column; padding-top: 0.6rem !important; }
+    @media (min-width: 769px) { #skill-sheet.open { align-items: center; } #skill-sheet .skl-box { border-radius: 14px; } }
+    .skl-head { display: flex; align-items: center; gap: 0.5rem; padding: 0.1rem 0.1rem 0.55rem; border-bottom: 1px solid var(--surface2); }
+    .skl-head b { font-size: 0.92rem; }
+    .skl-back { background: none; border: none; color: var(--text2); font-size: 1.3rem; line-height: 1; cursor: pointer; padding: 0 0.3rem; border-radius: 6px; }
+    .skl-back:hover { background: var(--surface2); }
+    .skl-view { flex: 1; min-height: 0; overflow-y: auto; scrollbar-width: thin; padding: 0.55rem 0.1rem 0.2rem; }
+    .skl-tools { display: flex; flex-wrap: wrap; gap: 0.35rem; margin-bottom: 0.5rem; }
+    .skl-tool { border: 1px solid var(--border); background: var(--surface2); color: var(--text2); border-radius: 8px; padding: 0.3rem 0.6rem; font-size: 0.74rem; cursor: pointer; white-space: nowrap; position: relative; }
+    .skl-tool.pri { background: var(--purple); border-color: var(--purple); color: #fff; font-weight: 600; }
+    .skl-badge { position: absolute; top: -6px; right: -6px; background: var(--green); color: #fff; border-radius: 8px; font-size: 0.6rem; padding: 0 0.3rem; font-weight: 700; }
+    .skl-banner { background: rgba(46,160,67,0.1); color: var(--green); border-radius: 8px; padding: 0.4rem 0.6rem; font-size: 0.74rem; cursor: pointer; margin-bottom: 0.4rem; }
+    .skl-grp { font-size: 0.68rem; color: var(--muted); font-weight: 600; padding: 0.5rem 0.2rem 0.2rem; }
+    .skl-item { display: flex; align-items: center; gap: 0.5rem; padding: 0.5rem 0.3rem; border-bottom: 1px solid var(--surface2); border-radius: 6px; }
+    .skl-item:hover { background: var(--surface2); }
+    .skl-main { flex: 1; min-width: 0; cursor: pointer; }
+    .skl-name { color: var(--purple2); font-weight: 600; font-size: 0.84rem; }
+    .skl-desc { font-size: 0.72rem; color: var(--muted); line-height: 1.45; margin-top: 0.1rem; word-break: break-word; }
+    .skl-tag { display: inline-block; margin-left: 0.35rem; font-size: 0.6rem; padding: 0.02rem 0.35rem; border-radius: 8px; border: 1px solid var(--border); color: var(--muted); vertical-align: 1px; }
+    .skl-tag.skill { border-color: var(--green); color: var(--green); }
+    .skl-tag.command { border-color: var(--purple2); color: var(--purple2); }
+    .skl-acts { display: flex; gap: 0.25rem; flex-shrink: 0; }
+    .skl-empty { text-align: center; color: var(--muted); padding: 1.6rem 0.5rem; font-size: 0.8rem; line-height: 1.7; }
+    .skl-foot { font-size: 0.68rem; color: var(--muted); line-height: 1.55; padding: 0.6rem 0.2rem 0; }
+    .skl-row { display: flex; gap: 0.4rem; align-items: center; margin-bottom: 0.35rem; flex-wrap: wrap; }
+    .skl-sel { flex: 1; min-width: 9rem; background: var(--bg); color: var(--text2); border: 1px solid var(--border); border-radius: 8px; padding: 0.45rem; font-size: 0.8rem; }
+    .skl-hint { font-size: 0.72rem; color: var(--muted); line-height: 1.6; }
+    .skl-hint code { background: var(--surface2); padding: 0 0.25rem; border-radius: 3px; }
+    .skl-lbl { font-size: 0.72rem; color: var(--text2); font-weight: 600; margin: 0.6rem 0 0.3rem; }
+    .skl-radios { display: flex; gap: 0.4rem; flex-wrap: wrap; }
+    .skl-radios label { flex: 1; min-width: 10rem; display: flex; gap: 0.4rem; align-items: flex-start; border: 1px solid var(--border); border-radius: 8px; padding: 0.45rem 0.55rem; cursor: pointer; font-size: 0.78rem; }
+    .skl-radios label b { white-space: nowrap; }
+    .skl-radios label small { display: block; color: var(--muted); font-size: 0.68rem; margin-top: 0.1rem; }
+    .skl-radios input { margin-top: 0.2rem; }
+    .skl-card { border: 1px solid var(--border); border-radius: 9px; padding: 0.5rem 0.6rem; margin-bottom: 0.45rem; font-size: 0.8rem; }
+    .skl-share-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 0.45rem; }
+    @media (max-width: 480px) { .skl-share-grid { grid-template-columns: 1fr; } }
+    .skl-big { text-align: left; border: 1px solid var(--border); background: var(--bg); color: var(--text); border-radius: 10px; padding: 0.55rem 0.65rem; cursor: pointer; display: grid; grid-template-columns: 1.6rem 1fr; column-gap: 0.3rem; align-items: center; }
+    .skl-big:hover { border-color: var(--purple); }
+    .skl-big span { grid-row: span 2; font-size: 1.1rem; }
+    .skl-big b { font-size: 0.8rem; }
+    .skl-big small { color: var(--muted); font-size: 0.66rem; line-height: 1.4; }
+    .skl-out { margin-top: 0.5rem; font-size: 0.76rem; color: var(--text2); line-height: 1.6; background: var(--surface2); border-radius: 8px; padding: 0.5rem 0.6rem; }
+    .skl-warn { background: rgba(248,81,73,0.1); color: var(--red); border-radius: 8px; padding: 0.45rem 0.6rem; font-size: 0.74rem; line-height: 1.55; margin: 0.4rem 0; }
+    .skl-ok { color: var(--green); font-size: 0.74rem; margin: 0.35rem 0; }
+    .skl-findings { margin: 0.35rem 0; display: flex; flex-direction: column; gap: 0.25rem; }
+    .skl-f { font-size: 0.72rem; border-radius: 6px; padding: 0.3rem 0.5rem; line-height: 1.5; }
+    .skl-f.danger { background: rgba(248,81,73,0.1); color: var(--red); }
+    .skl-f.warn { background: rgba(210,153,34,0.1); color: var(--yellow); }
+    .skl-f small { color: var(--muted); }
+    .skl-f code { display: block; margin-top: 0.15rem; font-size: 0.68rem; color: var(--text2); white-space: pre-wrap; word-break: break-all; }
+    .skl-files { margin: 0.4rem 0; font-size: 0.74rem; }
+    .skl-files summary { cursor: pointer; color: var(--blue2); }
+    .skl-files pre { background: var(--bg); border: 1px solid var(--border); border-radius: 6px; padding: 0.45rem; font-size: 0.7rem; max-height: 14rem; overflow: auto; white-space: pre-wrap; word-break: break-word; }
+    .skl-fname { font-weight: 600; margin-top: 0.4rem; color: var(--text2); }
+    .skl-confirm { display: flex; gap: 0.4rem; align-items: center; font-size: 0.74rem; color: var(--text2); margin-top: 0.4rem; cursor: pointer; }
+    .skl-pick { display: flex; gap: 0.5rem; align-items: flex-start; padding: 0.45rem 0.2rem; border-bottom: 1px solid var(--surface2); cursor: pointer; }
+    .skl-pick input { margin-top: 0.2rem; }
+    .sk.skl-dot::after { content: ''; display: inline-block; width: 6px; height: 6px; border-radius: 50%; background: var(--green); margin-left: 0.25rem; vertical-align: 2px; }
+    /* 草稿面板（队列） */
+    .ib-box { max-width: 640px !important; max-height: min(86vh, 760px); min-height: min(420px, 80vh); display: flex; flex-direction: column; padding-top: 0.6rem !important; }
+    @media (min-width: 769px) { #inbox-sheet.open { align-items: center; } #inbox-sheet .ib-box { border-radius: 14px; } }
+    .ib-head { display: flex; align-items: center; gap: 0.6rem; padding: 0.1rem 0.1rem 0.55rem; border-bottom: 1px solid var(--surface2); }
+    .ib-head > b { font-size: 0.92rem; white-space: nowrap; }
+    .ib-tabs { display: flex; gap: 2px; background: var(--surface2); border-radius: 8px; padding: 2px; }
+    .ib-tabs button { border: none; background: none; color: var(--muted); font-size: 0.74rem; padding: 0.25rem 0.65rem; border-radius: 6px; cursor: pointer; white-space: nowrap; }
+    .ib-tabs button.on { background: var(--surface); color: var(--text); font-weight: 600; box-shadow: 0 1px 2px rgba(0,0,0,0.12); }
+    .ib-x { margin-left: auto; background: none; border: none; color: var(--muted); font-size: 1rem; cursor: pointer; padding: 0.15rem 0.4rem; border-radius: 6px; }
+    .ib-x:hover { background: var(--surface2); color: var(--text); }
+    .ib-pane { flex: 1; min-height: 0; display: flex; flex-direction: column; }
+    .ib-bar { display: flex; align-items: center; gap: 0.5rem; padding: 0.5rem 0.1rem 0.35rem; flex-wrap: wrap; }
+    .ib-hint { flex: 1; min-width: 8em; font-size: 0.68rem; color: var(--muted); line-height: 1.45; }
+    .ib-autoall { display: flex; align-items: center; gap: 0.4rem; position: relative; font-size: 0.72rem; color: var(--text2); cursor: pointer; white-space: nowrap; }
+    /* 开关样式：比「复选框 + ▶」直观，一眼看出开 / 关 */
+    .ib-autoall input { position: absolute; opacity: 0; width: 0; height: 0; }
+    .ib-sw { position: relative; width: 1.9rem; height: 1.05rem; border-radius: 1rem; background: var(--border2, var(--border)); transition: background 0.15s; flex-shrink: 0; }
+    .ib-sw::after { content: ''; position: absolute; top: 0.125rem; left: 0.125rem; width: 0.8rem; height: 0.8rem; border-radius: 50%; background: #fff; box-shadow: 0 1px 2px rgba(0,0,0,0.25); transition: transform 0.15s; }
+    .ib-autoall input:checked + .ib-sw { background: var(--green); }
+    .ib-autoall input:checked + .ib-sw::after { transform: translateX(0.85rem); }
+    .ib-autoall input:indeterminate + .ib-sw { background: rgba(46,160,67,0.45); }
+    .ib-autoall input:focus-visible + .ib-sw { outline: 2px solid var(--green); outline-offset: 2px; }
+    .ib-paused { display: flex; align-items: center; gap: 0.5rem; font-size: 0.7rem; color: var(--yellow); background: rgba(210,153,34,0.10); border-radius: 8px; padding: 0.35rem 0.55rem; margin-bottom: 0.3rem; }
+    .ib-paused span { flex: 1; }
+    .ib-list { flex: 1; min-height: 3rem; overflow-y: auto; scrollbar-width: thin; }
+    .ib-item { display: flex; gap: 0.45rem; align-items: flex-start; padding: 0.5rem 0.3rem; border-bottom: 1px solid var(--surface2); border-radius: 6px; }
+    .ib-item.sel { background: rgba(46,160,67,0.08); }
+    .ib-item.drag-over-top { box-shadow: inset 0 2px 0 var(--green); }
+    .ib-item.drag-over-bottom { box-shadow: inset 0 -2px 0 var(--green); }
+    .ib-item.dragging { opacity: 0.4; }
+    .ib-handle { cursor: grab; color: var(--dim, var(--muted)); font-size: 0.8rem; padding-top: 0.1rem; user-select: none; letter-spacing: -2px; }
+    @media (hover: none) { .ib-handle { display: none; } }
+    .ib-no { flex-shrink: 0; min-width: 1.35rem; height: 1.35rem; border-radius: 50%; background: var(--surface2); color: var(--text2); font-size: 0.68rem; font-weight: 700; display: flex; align-items: center; justify-content: center; }
+    .ib-no.auto { background: var(--green); color: #fff; }
+    .ib-item input[type=checkbox] { width: 1.05rem; height: 1.05rem; margin-top: 0.15rem; flex-shrink: 0; }
+    .ib-main { flex: 1; min-width: 0; }
+    .ib-text { color: var(--text); font-size: 0.82rem; line-height: 1.5; word-break: break-word; white-space: pre-wrap; cursor: text; display: -webkit-box; -webkit-line-clamp: 4; -webkit-box-orient: vertical; overflow: hidden; border-radius: 4px; }
+    .ib-text:hover { background: var(--surface2); }
+    .ib-edit textarea { width: 100%; box-sizing: border-box; min-height: 5.5em; background: var(--bg); color: var(--text); border: 1px solid var(--green); border-radius: 7px; padding: 0.4rem 0.5rem; font: inherit; font-size: 0.82rem; resize: vertical; outline: none; }
+    .ib-edit div { display: flex; gap: 0.4rem; justify-content: flex-end; margin-top: 0.3rem; align-items: center; }
+    .ib-meta { display: flex; align-items: center; flex-wrap: wrap; gap: 0.3rem 0.5rem; margin-top: 0.3rem; font-size: 0.66rem; color: var(--muted); }
+    .ib-chip { border: 1px solid var(--border); background: none; color: var(--muted); border-radius: 10px; padding: 0.05rem 0.45rem; font-size: 0.64rem; cursor: pointer; }
+    .ib-chip.on { border-color: var(--green); color: var(--green); font-weight: 600; }
+    .ib-acts { display: flex; gap: 0.25rem; margin-left: auto; }
+    .ib-ic { border: none; background: var(--surface2); color: var(--text2); border-radius: 6px; font-size: 0.7rem; padding: 0.22rem 0.45rem; cursor: pointer; }
+    .ib-ic:disabled { opacity: 0.35; cursor: default; }
+    .ib-selbar { display: flex; align-items: center; gap: 0.4rem; flex-wrap: wrap; padding: 0.45rem 0.2rem; border-top: 1px solid var(--surface2); font-size: 0.74rem; }
+    .ib-selbar span { margin-right: auto; color: var(--text2); }
+    .ib-compose { border-top: 1px solid var(--surface2); padding: 0.5rem 0.1rem 0; }
+    .ib-compose textarea { width: 100%; box-sizing: border-box; background: var(--surface2); color: var(--text); border: 1px solid var(--border); border-radius: 8px; padding: 0.45rem 0.55rem; font-size: 0.82rem; resize: vertical; min-height: 2.6em; }
+    .ib-compose-row { display: flex; align-items: center; gap: 0.55rem; margin-top: 0.4rem; flex-wrap: wrap; }
+    .ib-link { color: var(--blue2); cursor: pointer; font-size: 0.7rem; }
+    .ib-grp { font-size: 0.7rem; color: var(--blue2); font-weight: 600; padding: 0.55rem 0.2rem 0.15rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
     .dr-sess { font-size: 0.68rem; color: var(--blue2); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
     .mem-file { margin-bottom: 0.5rem; border: 1px solid var(--surface2); border-radius: 8px; overflow: hidden; }
     .mem-file-header { display: flex; align-items: center; gap: 0.35rem; padding: 0.4rem 0.6rem; background: var(--surface2); cursor: pointer; font-size: 0.75rem; color: var(--blue); user-select: none; }
@@ -488,6 +607,44 @@
     #qr-box .close-btn { margin-top: 1rem; background: var(--surface2); color: var(--text); border: 1px solid var(--border); border-radius: 6px; padding: 0.5rem 1.5rem; cursor: pointer; font-size: 0.9rem; }
     #status-overlay { position: fixed; inset: 0; display: flex; flex-direction: column; align-items: center; justify-content: center; background: rgba(13,17,23,0.85); color: var(--muted); font-size: 0.9rem; z-index: 50; }
     #status-overlay.hidden { display: none; }
+
+    /* ── 💡 问一问：选中文字浮出的小工具条 + 旁边的问答小窗（不进当前会话） ── */
+    #ask-pop { position: fixed; z-index: 60; display: none; gap: 2px; padding: 3px; background: var(--surface); border: 1px solid var(--border2, var(--border)); border-radius: 9px; box-shadow: 0 6px 20px rgba(0,0,0,0.25); }
+    #ask-pop.show { display: flex; }
+    #ask-pop button { background: none; border: none; color: var(--text); font-size: 0.78rem; padding: 0.35rem 0.6rem; border-radius: 6px; cursor: pointer; white-space: nowrap; }
+    #ask-pop button:hover { background: var(--surface2); }
+    #ask-pop button.pri { color: var(--green); font-weight: 600; }
+    #ask-backdrop { display: none; position: fixed; inset: 0; z-index: 69; background: rgba(0,0,0,0.4); }
+    #ask-panel { position: fixed; z-index: 70; top: 0; right: 0; bottom: 0; width: min(420px, 100vw); background: var(--surface); border-left: 1px solid var(--border); box-shadow: -8px 0 30px rgba(0,0,0,0.18);
+      display: flex; flex-direction: column; transform: translateX(105%); transition: transform 0.2s ease; }
+    #ask-panel.open { transform: none; }
+    .ask-head { display: flex; align-items: flex-start; gap: 0.5rem; padding: 0.8rem 0.9rem 0.6rem; border-bottom: 1px solid var(--border); }
+    .ask-head b { font-size: 0.95rem; }
+    .ask-sub { font-size: 0.7rem; color: var(--muted); margin-top: 0.15rem; }
+    .ask-x { margin-left: auto; background: none; border: none; color: var(--muted); font-size: 1rem; cursor: pointer; padding: 0.1rem 0.35rem; border-radius: 6px; }
+    .ask-x:hover { background: var(--surface2); color: var(--text); }
+    #ask-body { flex: 1; overflow-y: auto; padding: 0.7rem 0.9rem; font-size: 0.84rem; line-height: 1.7; }
+    .ask-quote { border-left: 3px solid var(--green); background: var(--bg); padding: 0.4rem 0.6rem; border-radius: 0 6px 6px 0; color: var(--text2, var(--text)); font-size: 0.78rem; white-space: pre-wrap; word-break: break-word; max-height: 8.5em; overflow-y: auto; margin-bottom: 0.7rem; }
+    .ask-q { margin: 0.7rem 0 0.3rem; text-align: right; }
+    .ask-q span { display: inline-block; background: var(--surface2); border-radius: 10px; padding: 0.3rem 0.65rem; font-size: 0.8rem; text-align: left; white-space: pre-wrap; }
+    .ask-a { padding: 0.1rem 0; }
+    .ask-a p { margin: 0.3rem 0; } .ask-a ul, .ask-a ol { margin: 0.3rem 0; padding-left: 1.2rem; }
+    .ask-a h1, .ask-a h2, .ask-a h3 { font-size: 0.88rem; margin: 0.5rem 0 0.3rem; }
+    .ask-a code { background: var(--surface2); padding: 0.05rem 0.3rem; border-radius: 4px; font-size: 0.78rem; font-family: 'SF Mono','Consolas',monospace; }
+    .ask-a pre { background: var(--bg); border: 1px solid var(--border); padding: 0.5rem 0.6rem; border-radius: 6px; overflow-x: auto; } .ask-a pre code { background: none; padding: 0; }
+    .ask-a.err { color: var(--red); font-size: 0.8rem; }
+    .ask-acts { display: flex; gap: 0.4rem; margin: 0.35rem 0 0.2rem; }
+    .ask-acts button { background: var(--bg); border: 1px solid var(--border); color: var(--text2, var(--text)); border-radius: 7px; padding: 0.22rem 0.6rem; font-size: 0.74rem; cursor: pointer; }
+    .ask-acts button.pri { border-color: var(--green); color: var(--green); font-weight: 600; }
+    .ask-foot { border-top: 1px solid var(--border); padding: 0.55rem 0.7rem calc(0.55rem + env(safe-area-inset-bottom)); display: flex; gap: 0.45rem; align-items: flex-end; }
+    #ask-input { flex: 1; resize: none; max-height: 7em; min-height: 2.3em; background: var(--bg); color: var(--text); border: 1px solid var(--border); border-radius: 9px; padding: 0.45rem 0.6rem; font: inherit; font-size: 0.84rem; outline: none; }
+    #ask-input:focus { border-color: var(--green); }
+    #ask-send { flex-shrink: 0; background: var(--green); color: #fff; border: none; border-radius: 9px; padding: 0.5rem 0.8rem; font-size: 0.8rem; cursor: pointer; }
+    #ask-send.stop { background: var(--surface2); color: var(--text); }
+    @media (max-width: 768px) {
+      #ask-panel { top: auto; left: 0; width: auto; height: 78vh; border-left: none; border-top: 1px solid var(--border); border-radius: 16px 16px 0 0; transform: translateY(105%); }
+      #ask-panel.open + #ask-backdrop, #ask-backdrop.show { display: block; }
+    }
   </style>
 </head>
 <body>
@@ -567,6 +724,8 @@
         <button class="tb-btn" id="send-btn" onclick="sendCommand()" title="发送">
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><line x1="22" y1="2" x2="11" y2="13"/><polygon points="22 2 15 22 11 13 2 9 22 2"/></svg>
         </button>
+        <!-- ⚡ 插话：AI 忙时把输入直接送进正在干的这一轮（不打断，AI 下一步看到）；存草稿则等干完再发 -->
+        <button id="inject-btn" class="inj-btn" style="display:none" onclick="injectFromInput()" title="不打断 AI：马上把这条送过去，AI 在下一步就会看到并调整。&#10;适合补充、提醒、微调方向；方向完全错了请先点 ■ 停止">⚡ 插话</button>
         <!-- AI 忙时顶替发送键：这轮还没完（可能在跑子代理），先把想法存成草稿 -->
         <button class="tb-btn" id="draft-btn" style="display:none;color:var(--yellow)" onclick="saveDraftFromInput('busy')" title="AI 还在跑，先存为草稿，干完再发">
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
@@ -880,44 +1039,61 @@
     </div>
   </div>
 
-  <!-- 灵感收件箱（草稿队列）：会话正忙时先记下想法，干完再发。每条强制归属一个任务 -->
+  <!-- 灵感收件箱（草稿队列）：会话正忙时先记下想法，干完再发。每条强制归属一个任务。
+       本任务的草稿是一个有顺序的队列：可拖动 / ↑↓ 排序、就地编辑、多选合并 / 一起取回，开「依次自动发送」后每干完一轮发下一条 -->
   <div id="inbox-sheet" class="action-sheet">
     <div class="action-sheet-backdrop" onclick="closeInboxSheet()"></div>
-    <div class="action-sheet-box" style="max-height:85vh;display:flex;flex-direction:column">
-      <div class="action-sheet-title">📥 灵感收件箱 · 草稿</div>
-      <div style="font-size:0.68rem;color:var(--muted);padding:0 0.2rem 0.5rem;line-height:1.55">
-        随手记想法：先存这儿，AI 干完后<b>取回</b>发送；勾「<b>自动接力</b>」则干完自动发出。只存本机，细节见各条目按钮。
-      </div>
-      <!-- 就地新增：不必先在消息框打字再"提取"，直接在这儿写 -->
-      <div style="border-top:1px solid var(--surface2);padding:0.5rem 0.2rem">
-        <textarea id="inbox-new-text" rows="3" spellcheck="false" placeholder="写下临时想法…（截图可直接 Ctrl+V 粘进来）"
-                  style="width:100%;box-sizing:border-box;background:var(--surface2);color:var(--text);border:1px solid var(--border);border-radius:8px;padding:0.5rem;font-size:0.82rem;resize:vertical"></textarea>
-        <div id="inbox-new-img" style="display:none;align-items:center;gap:0.4rem;margin-top:0.35rem;font-size:0.7rem;color:var(--text2)">
-          <span>📷</span><span id="inbox-new-img-name" style="flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap"></span>
-          <button class="dr-btn" onclick="clearInboxNewImage()">移除</button>
+    <div class="action-sheet-box ib-box">
+      <div class="ib-head">
+        <b>📥 草稿</b>
+        <div class="ib-tabs">
+          <button data-ibt="this" class="on" onclick="ibTab('this')">本任务 <span id="ib-n-this"></span></button>
+          <button data-ibt="others" onclick="ibTab('others')">其它任务 <span id="inbox-others-count"></span></button>
         </div>
-        <div style="display:flex;align-items:center;gap:0.5rem;margin-top:0.45rem;flex-wrap:wrap">
-          <button class="dr-btn" onclick="document.getElementById('inbox-new-file').click()" title="也可以直接 Ctrl+V 粘贴截图">📷 选图片</button>
-          <input type="file" id="inbox-new-file" accept="image/*" style="display:none"
-                 onchange="uploadInboxImage(this.files[0]); this.value='';">
-          <label style="display:flex;align-items:center;gap:0.3rem;font-size:0.7rem;color:var(--muted);cursor:pointer">
-            <input type="checkbox" id="inbox-new-autosend" style="width:1rem;height:1rem"> 自动接力
+        <button class="ib-x" onclick="closeInboxSheet()" title="关闭">✕</button>
+      </div>
+      <div id="ib-pane-this" class="ib-pane">
+        <div class="ib-bar">
+          <span id="ib-hint" class="ib-hint"></span>
+          <button id="ib-sel-btn" class="dr-btn" onclick="ibToggleSelect()" title="勾选几条后合并、一起取回或删除">☑ 多选</button>
+          <label id="ib-autoall" class="ib-autoall" title="打开后：每干完一轮，自动按顺序发出下一条（每条都是一轮真实的模型调用）。上一轮被中断或出错时会暂停，等你确认再继续。">
+            <input type="checkbox" id="ib-auto-all" onchange="ibAutoAll(this.checked)"><span class="ib-sw"></span>依次自动发送
           </label>
-          <button class="dr-btn take" style="margin-left:auto;padding:0.35rem 1rem" onclick="addDraftHere()">＋ 记下来</button>
         </div>
-        <div style="margin-top:0.4rem">
-          <a onclick="saveDraftFromInput('manual')" style="color:var(--blue2);cursor:pointer;font-size:0.7rem">或：把下方消息框里已写的内容存为草稿 ↓</a>
+        <div id="ib-paused" class="ib-paused" style="display:none">
+          <span>⏸ 自动发送暂停中：上一轮被中断或出错时不会自动往下发</span>
+          <button class="dr-btn take" onclick="ibResume()">继续发送</button>
+        </div>
+        <div id="inbox-this" class="ib-list"></div>
+        <div id="ib-selbar" class="ib-selbar" style="display:none">
+          <span>已选 <b id="ib-sel-n">0</b> 条</span>
+          <button class="dr-btn" onclick="ibMergeSelected(false)" title="按列表顺序拼成一条（自动编号），可再编辑；之后也能撤销合并">🔗 合并</button>
+          <button class="dr-btn take" onclick="ibMergeSelected(true)" title="合并后直接放进消息框">一起取回</button>
+          <button class="dr-btn" onclick="ibDeleteSelected()" style="color:var(--red)">删除</button>
+          <button class="dr-btn" onclick="ibToggleSelect(false)">取消</button>
+        </div>
+        <!-- 就地新增：不必先在消息框打字再"提取"，直接在这儿写 -->
+        <div class="ib-compose">
+          <textarea id="inbox-new-text" rows="2" spellcheck="false" placeholder="记下一个想法…（截图可直接 Ctrl+V 粘进来）"></textarea>
+          <div id="inbox-new-img" style="display:none;align-items:center;gap:0.4rem;margin-top:0.3rem;font-size:0.7rem;color:var(--text2)">
+            <span>📷</span><span id="inbox-new-img-name" style="flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap"></span>
+            <button class="dr-btn" onclick="clearInboxNewImage()">移除</button>
+          </div>
+          <div class="ib-compose-row">
+            <button class="dr-btn" onclick="document.getElementById('inbox-new-file').click()" title="也可以直接 Ctrl+V 粘贴截图">📷</button>
+            <input type="file" id="inbox-new-file" accept="image/*" style="display:none" onchange="uploadInboxImage(this.files[0]); this.value='';">
+            <label style="display:flex;align-items:center;gap:0.3rem;font-size:0.7rem;color:var(--muted);cursor:pointer" title="这条也参与自动发送">
+              <input type="checkbox" id="inbox-new-autosend" style="width:0.95rem;height:0.95rem"> ⚡ 自动
+            </label>
+            <a onclick="saveDraftFromInput('manual')" class="ib-link" title="把下方消息框里已写的内容存为草稿">存消息框内容</a>
+            <button class="dr-btn take" style="margin-left:auto;padding:0.35rem 0.95rem" onclick="addDraftHere()">＋ 记下来</button>
+          </div>
         </div>
       </div>
-      <div style="font-size:0.66rem;color:var(--muted);padding:0.5rem 0.2rem 0.2rem;border-top:1px solid var(--surface2)">
-        <b>本任务</b>（<span id="inbox-this-title"></span>）
-      </div>
-      <div id="inbox-this" style="overflow-y:auto;padding:0.2rem 0;font-size:0.8rem;scrollbar-width:thin;min-height:3rem;max-height:34vh"></div>
-      <div style="font-size:0.66rem;color:var(--muted);padding:0.4rem 0.2rem 0.2rem;border-top:1px solid var(--surface2)">
-        <a onclick="toggleInboxOthers()" style="color:var(--blue2);cursor:pointer">▸ 其它任务的草稿 <span id="inbox-others-count"></span></a>
+      <div id="ib-pane-others" class="ib-pane" style="display:none">
+        <div class="ib-hint" style="padding:0.1rem 0.2rem 0.4rem">其它任务里记的草稿。点「改投」挪到本任务。</div>
+        <div id="inbox-others" class="ib-list"></div>
       </div>
-      <div id="inbox-others" style="display:none;overflow-y:auto;padding:0.2rem 0;font-size:0.8rem;scrollbar-width:thin;max-height:26vh"></div>
-      <button class="action-sheet-cancel" onclick="closeInboxSheet()">关闭</button>
     </div>
   </div>
 
@@ -1052,6 +1228,25 @@
     </div>
   </div>
 
+  <!-- 💡 问一问：选中文字后的小工具条 + 问答小窗。问答不进当前会话，不打扰正在干活的 AI -->
+  <div id="ask-pop">
+    <button class="pri" onmousedown="event.preventDefault()" onclick="askFromSelection(false)">💡 解释</button>
+    <button onmousedown="event.preventDefault()" onclick="askFromSelection(true)">❓ 问一问…</button>
+    <button onmousedown="event.preventDefault()" onclick="askCopySelection()">📋 复制</button>
+  </div>
+  <div id="ask-panel" role="dialog" aria-label="问一问">
+    <div class="ask-head">
+      <div><b>💡 问一问</b><div class="ask-sub">这里的问答不会打扰正在干活的 AI，放心问</div></div>
+      <button class="ask-x" onclick="closeAsk()" title="关闭 (Esc)">✕</button>
+    </div>
+    <div id="ask-body"></div>
+    <div class="ask-foot">
+      <textarea id="ask-input" rows="1" placeholder="继续问…（Enter 发送）"></textarea>
+      <button id="ask-send" onclick="askSendOrStop()">发送</button>
+    </div>
+  </div>
+  <div id="ask-backdrop" onclick="closeAsk()"></div>
+
   <!-- 清除：先说清楚会发生什么，免得误以为出了故障 -->
   <div id="clear-sheet" class="action-sheet">
     <div class="action-sheet-backdrop" onclick="closeClearSheet()"></div>
@@ -1071,59 +1266,113 @@
 
   <div id="skill-sheet" class="action-sheet">
     <div class="action-sheet-backdrop" onclick="closeSkillSheet()"></div>
-    <div class="action-sheet-box" style="max-height:85vh;display:flex;flex-direction:column">
-      <div class="action-sheet-title" style="display:flex;align-items:center;justify-content:space-between;text-align:left">
-        <span id="skill-sheet-title">技能管理</span>
-        <div style="display:flex;gap:0.4rem">
-          <button onclick="showSkillMarket()" style="background:var(--surface2);color:var(--text2);border:1px solid var(--border);border-radius:6px;padding:0.3rem 0.7rem;font-size:0.75rem;cursor:pointer">市场</button>
-          <button onclick="showSkillImport()" style="background:var(--surface2);color:var(--text2);border:1px solid var(--border);border-radius:6px;padding:0.3rem 0.7rem;font-size:0.75rem;cursor:pointer">Git</button>
-          <button onclick="showSkillEditor()" style="background:var(--purple);color:#fff;border:none;border-radius:6px;padding:0.3rem 0.7rem;font-size:0.75rem;cursor:pointer">+ 新建</button>
-        </div>
+    <div class="action-sheet-box skl-box">
+      <div class="skl-head">
+        <button id="skl-back" class="skl-back" onclick="sklView('list')" style="display:none" title="返回">‹</button>
+        <b id="skill-sheet-title">技能</b>
+        <button class="ib-x" onclick="closeSkillSheet()" title="关闭">✕</button>
       </div>
-      <!-- 技能列表视图 -->
-      <div id="skill-list-view" style="flex:1;overflow-y:auto;scrollbar-width:thin">
-        <div style="text-align:center;color:var(--muted);padding:2rem 0">加载中...</div>
+      <!-- 列表 -->
+      <div id="skl-v-list" class="skl-view">
+        <div class="skl-tools">
+          <button class="skl-tool pri" onclick="sklView('gen')" title="把本次任务里的做法提炼成技能，以后一点就能复用">✨ 从本次任务生成</button>
+          <button class="skl-tool" onclick="sklView('import')" title="粘贴分享码 / 分享链接，或选择技能文件">📥 导入</button>
+          <button class="skl-tool" onclick="sklView('team')" title="团队技能仓库：订阅、检查更新">👥 团队仓库<span id="skl-upd-badge" class="skl-badge" style="display:none"></span></button>
+          <button class="skl-tool" onclick="showSkillMarket()">🛒 市场</button>
+          <button class="skl-tool" onclick="showSkillEditor()">＋ 手写</button>
+        </div>
+        <div id="skl-upd-banner" class="skl-banner" style="display:none" onclick="sklView('team')"></div>
+        <div id="skill-list-view" class="skl-list"></div>
+        <div class="skl-foot">技能 = 预先写好的一段做事方法。<b>手动技能</b>点快捷栏按钮（或输入 /名称）运行；<b>自动技能</b>不用点，AI 遇到合适的场景会自己用。</div>
       </div>
-      <!-- 技能编辑视图 -->
-      <div id="skill-edit-view" style="display:none;flex:1;overflow-y:auto;scrollbar-width:thin;padding:0.3rem 0.2rem">
-        <div style="display:flex;flex-direction:column;gap:0.4rem">
-          <input id="skill-name" class="slash-inp" placeholder="技能名称 (如 mosaic-names)" autocomplete="off">
-          <select id="skill-scope" class="slash-inp" style="background:var(--bg);color:var(--text2);border:1px solid var(--border);border-radius:8px;padding:0.5rem;font-size:0.82rem">
-            <option value="user">用户级 (~/.claude/commands/)</option>
-            <option value="project">项目级 (.claude/commands/)</option>
+      <!-- 编辑 -->
+      <div id="skl-v-edit" class="skl-view" style="display:none">
+        <div class="skl-row">
+          <input id="skill-name" class="slash-inp" placeholder="名称（英文，如 deploy-test）" autocomplete="off" style="flex:1">
+        </div>
+        <div class="skl-row">
+          <select id="skill-kind" class="slash-inp skl-sel" onchange="sklKindChanged()">
+            <option value="command">手动技能（/命令，点按钮运行）</option>
+            <option value="skill">自动技能（AI 遇到合适场景自己用）</option>
+          </select>
+          <select id="skill-scope" class="slash-inp skl-sel">
+            <option value="project">只在本项目</option>
+            <option value="user">本机所有项目</option>
           </select>
-          <textarea id="skill-content" class="slash-inp" placeholder="# 技能标题&#10;&#10;技能描述和指令内容..." rows="10" style="resize:vertical;font-family:monospace;font-size:0.78rem;line-height:1.5"></textarea>
         </div>
-        <button class="action-sheet-cancel" style="background:var(--purple);color:#fff;font-weight:600;margin-top:0.5rem;margin-bottom:0.4rem" onclick="saveSkill()">保存</button>
-        <button class="action-sheet-cancel" onclick="backToSkillList()">返回列表</button>
+        <textarea id="skill-content" class="slash-inp" rows="14" style="resize:vertical;font-family:monospace;font-size:0.78rem;line-height:1.5;width:100%;box-sizing:border-box"></textarea>
+        <div id="skill-edit-hint" class="skl-hint"></div>
+        <button class="action-sheet-cancel" style="background:var(--purple);color:#fff;font-weight:600;margin-top:0.5rem" onclick="saveSkill()">保存</button>
       </div>
-      <!-- Git 安装视图 -->
-      <div id="skill-import-view" style="display:none;flex:1;overflow-y:auto;scrollbar-width:thin;padding:0.3rem 0.2rem">
-        <div style="display:flex;flex-direction:column;gap:0.4rem">
-          <div style="display:flex;gap:0.4rem">
-            <input id="skill-git-url" class="slash-inp" placeholder="Git 仓库地址 (https:// 或 git@...)" autocomplete="off" style="flex:1">
-            <button onclick="scanGitSkills()" style="background:var(--purple);color:#fff;border:none;border-radius:8px;padding:0.5rem 0.8rem;font-size:0.82rem;cursor:pointer;white-space:nowrap">扫描</button>
-          </div>
-          <div id="skill-git-auth" style="display:flex;gap:0.4rem">
-            <input id="skill-git-user" class="slash-inp" placeholder="用户名 (可选)" autocomplete="off" style="flex:1">
-            <input id="skill-git-pass" class="slash-inp" placeholder="密码/Token (可选)" type="password" autocomplete="off" style="flex:1">
+      <!-- 从本次任务生成 -->
+      <div id="skl-v-gen" class="skl-view" style="display:none">
+        <div class="skl-hint" style="margin-bottom:0.5rem">让正在干活的 AI 把<b>本次任务里的做法</b>提炼成可复用的技能：项目特有的路径、名字会改成参数，不会写进密码等敏感信息。AI <b>先出草稿给你确认</b>，确认后才保存。</div>
+        <textarea id="skl-gen-hint" class="slash-inp" rows="3" placeholder="想沉淀成什么技能？例如「把今天这套部署到测试环境的流程做成技能」。可以留空，让 AI 自己判断" style="width:100%;box-sizing:border-box;resize:vertical"></textarea>
+        <div class="skl-lbl">技能类型</div>
+        <div class="skl-radios">
+          <label><input type="radio" name="skl-gen-kind" value="command" checked> <b>手动技能</b><small>点按钮 / 输入 /名称 才运行，最直观</small></label>
+          <label><input type="radio" name="skl-gen-kind" value="skill"> <b>自动技能</b><small>AI 遇到合适场景自己用，可带辅助脚本</small></label>
+        </div>
+        <div class="skl-lbl">保存到</div>
+        <div class="skl-radios">
+          <label><input type="radio" name="skl-gen-scope" value="project" checked> <b>只在本项目</b><small>跟着项目目录走</small></label>
+          <label><input type="radio" name="skl-gen-scope" value="user"> <b>本机所有项目</b><small>这台电脑上的任务都能用</small></label>
+        </div>
+        <button class="action-sheet-cancel" style="background:var(--purple);color:#fff;font-weight:600;margin-top:0.6rem" onclick="genSkillFromTask()">✨ 让 AI 起草</button>
+      </div>
+      <!-- 分享 -->
+      <div id="skl-v-share" class="skl-view" style="display:none">
+        <div id="skl-share-info" class="skl-card"></div>
+        <div id="skl-share-warn" class="skl-warn" style="display:none"></div>
+        <div class="skl-share-grid">
+          <button class="skl-big" onclick="sklShareDownload()"><span>⬇</span><b>下载技能文件</b><small>微信 / 邮件发给对方，对方「📥 导入」</small></button>
+          <button class="skl-big" onclick="sklShareCode()"><span>📋</span><b>复制分享码</b><small>一段文本，粘贴给对方导入</small></button>
+          <button class="skl-big" onclick="sklShareLink()"><span>🔗</span><b>生成分享链接</b><small>同一局域网 / Tailscale 的 myhi 直接导入，24 小时有效</small></button>
+          <button class="skl-big" onclick="sklSharePublishForm()"><span>👥</span><b>发布到团队仓库</b><small>推到 Git 仓库，订阅的人会收到更新</small></button>
+        </div>
+        <div id="skl-share-out" class="skl-out" style="display:none"></div>
+        <div id="skl-pub-form" style="display:none;margin-top:0.5rem">
+          <input id="skl-pub-url" class="slash-inp" placeholder="仓库地址（https://… 或 git@…）" autocomplete="off" style="width:100%;box-sizing:border-box;margin-bottom:0.35rem">
+          <div class="skl-row">
+            <input id="skl-pub-user" class="slash-inp" placeholder="用户名（可选）" autocomplete="off" style="flex:1">
+            <input id="skl-pub-pass" class="slash-inp" type="password" placeholder="Token（需要写权限）" autocomplete="off" style="flex:1">
+            <input id="skl-pub-branch" class="slash-inp" placeholder="分支（默认）" autocomplete="off" style="width:6.5rem">
           </div>
-          <select id="skill-import-scope" class="slash-inp" style="background:var(--bg);color:var(--text2);border:1px solid var(--border);border-radius:8px;padding:0.5rem;font-size:0.82rem">
-            <option value="user">安装到用户级 (~/.claude/commands/)</option>
-            <option value="project">安装到项目级 (.claude/commands/)</option>
+          <button class="action-sheet-cancel" style="background:var(--purple);color:#fff;font-weight:600;margin-top:0.4rem" onclick="sklPublish()">发布</button>
+        </div>
+      </div>
+      <!-- 导入 -->
+      <div id="skl-v-import" class="skl-view" style="display:none">
+        <textarea id="skl-imp-text" class="slash-inp" rows="3" placeholder="粘贴分享码（MYHI-SKILL:…）或分享链接（…/s/skill/…）" style="width:100%;box-sizing:border-box;resize:vertical"></textarea>
+        <div class="skl-row" style="margin-top:0.35rem">
+          <button class="dr-btn" onclick="document.getElementById('skl-imp-file').click()">📄 选择技能文件</button>
+          <input type="file" id="skl-imp-file" accept=".myhiskill,.json,.md" style="display:none" onchange="sklImportFile(this.files[0]); this.value='';">
+          <button class="dr-btn take" style="margin-left:auto" onclick="sklImportPreview()">预览</button>
+        </div>
+        <div id="skl-imp-preview"></div>
+      </div>
+      <!-- 团队仓库 -->
+      <div id="skl-v-team" class="skl-view" style="display:none">
+        <div id="skl-subs"></div>
+        <div class="skl-lbl" style="margin-top:0.6rem">添加团队仓库</div>
+        <input id="skill-git-url" class="slash-inp" placeholder="Git 仓库地址（https://… 或 git@…）" autocomplete="off" style="width:100%;box-sizing:border-box;margin-bottom:0.35rem">
+        <div class="skl-row">
+          <input id="skill-git-user" class="slash-inp" placeholder="用户名（可选）" autocomplete="off" style="flex:1">
+          <input id="skill-git-pass" class="slash-inp" type="password" placeholder="密码 / Token（可选）" autocomplete="off" style="flex:1">
+        </div>
+        <div class="skl-row">
+          <select id="skill-import-scope" class="slash-inp skl-sel">
+            <option value="user">装到本机所有项目</option>
+            <option value="project">只装到本项目</option>
           </select>
+          <button class="dr-btn take" onclick="scanGitSkills()">扫描</button>
         </div>
-        <div id="skill-import-preview" style="display:none;margin-top:0.5rem;padding:0.5rem;background:var(--bg);border:1px solid var(--border);border-radius:8px;font-size:0.78rem;max-height:30vh;overflow-y:auto;scrollbar-width:thin"></div>
-        <div id="skill-import-scan-btn"></div>
-        <button id="skill-import-install-btn" class="action-sheet-cancel" style="display:none;background:var(--green);color:#000;font-weight:600;margin-bottom:0.4rem" onclick="installGitSkills()">安装选中的技能</button>
-        <button class="action-sheet-cancel" onclick="backToSkillList()">返回列表</button>
+        <div id="skill-import-preview"></div>
       </div>
-      <!-- 技能市场视图 -->
-      <div id="skill-market-view" style="display:none;flex:1;overflow-y:auto;scrollbar-width:thin;padding:0.3rem 0">
+      <!-- 市场 -->
+      <div id="skl-v-market" class="skl-view" style="display:none">
         <div id="skill-market-list"></div>
-        <button class="action-sheet-cancel" onclick="backToSkillList()" style="margin-top:0.5rem">返回列表</button>
       </div>
-      <button id="skill-close-btn" class="action-sheet-cancel" onclick="closeSkillSheet()">关闭</button>
     </div>
   </div>
 
@@ -1730,14 +1979,20 @@
     }
 
     // ── 消息渲染 ──────────────────────────────────
-    function addInputMessage(text) {
+    // ⚡ 插话气泡上的小标记：等 AI 下一步看到 → AI 已看到 / 未送达
+    function injectTagHtml(inj) {
+      if (!inj) return '';
+      const st = inj.state || 'pending';
+      const txt = st === 'seen' ? '⚡ 插话 · AI 已看到' : st === 'dropped' ? '⚡ 插话 · 未送达' + (inj.reason ? '：' + inj.reason : '') : '⚡ 插话 · 等 AI 下一步看到';
+      return `<span class="inj-tag ${st}" data-inject-tag="${escHtml(inj.id || '')}">${escHtml(txt)}</span>`;
+    }
+    function addInputMessage(text, inject) {
       endStream(); endToolGroup();
       _userScrolledUp = false; hideNewMsgHint(); // 用户主动发消息 → 回到底部看回复
-      _streamedTextThisCall = false;
-      _textRenderedThisTurn = false;
+      if (!inject) { _streamedTextThisCall = false; _textRenderedThisTurn = false; }   // 插话并进当前这一轮，不算新一轮
       const msg = document.createElement('div');
-      msg.className = 'msg msg-input';
-      msg.innerHTML = `<div><div class="bubble">${escHtml(text)}</div><div class="meta">${formatTime(new Date())}</div></div>`;
+      msg.className = 'msg msg-input' + (inject ? ' msg-inject' : '');
+      msg.innerHTML = `<div><div class="bubble">${escHtml(text)}</div><div class="meta">${injectTagHtml(inject)}${formatTime(new Date())}</div></div>`;
       chatArea.appendChild(msg);
       trimMessages();
       scrollToBottom();
@@ -2191,9 +2446,9 @@
         if (sel) { parent.appendChild(sel); return; }
         if (syntheticUserKind(msg.content)) return;
         const el = document.createElement('div');
-        el.className = 'msg msg-input';
+        el.className = 'msg msg-input' + (msg.inject ? ' msg-inject' : '');
         const full = msg.timestamp ? new Date(msg.timestamp).toLocaleString('zh-CN') : '';
-        el.innerHTML = `<div><div class="bubble">${escHtml(msg.content)}</div><div class="meta" title="${escHtml(full)}">${msg.timestamp ? formatTime(new Date(msg.timestamp)) : ''}</div></div>`;
+        el.innerHTML = `<div><div class="bubble">${escHtml(msg.content)}</div><div class="meta" title="${escHtml(full)}">${injectTagHtml(msg.inject)}${msg.timestamp ? formatTime(new Date(msg.timestamp)) : ''}</div></div>`;
         parent.appendChild(el);
         return;
       }
@@ -2552,8 +2807,11 @@
         // busy 时发送键让位给「存草稿」键；回到 idle 再提示有没有待发草稿
         const draftBtn = document.getElementById('draft-btn');
         if (draftBtn) draftBtn.style.display = busy ? '' : 'none';
+        try { updateInjectBtn(); } catch {}
         // 用 try 包住：这两个绑定声明在文件后段，初始化早期调用会撞 TDZ
         try { if (!busy) _draftTipDismissed = false; renderDraftTip(); } catch {}
+        try { if (!busy && _sklGenPending) { const sc = _sklGenPending; _sklGenPending = false; loadSkills(); fetch('/api/skills/changed', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ sessionId: SESSION_ID, scope: sc }) }).catch(() => {}); } } catch {}
+        try { if (!busy) _ibIdleSince = Date.now(); if (document.getElementById('inbox-sheet').classList.contains('open')) renderInbox(); } catch {}
         try { if (!busy) checkGuide(); else renderGuideTip(); } catch {}
       }
       _postStatus(state);
@@ -2668,7 +2926,7 @@
         const btn = document.createElement('button');
         btn.textContent = '返回首页';
         btn.style.cssText = 'margin-top:1rem;padding:0.5rem 1.5rem;border:1px solid var(--muted);border-radius:8px;background:transparent;color:var(--text2);cursor:pointer;font-size:0.9rem';
-        btn.onclick = () => window.location.href = '/';
+        btn.onclick = () => goHome();
         overlay.appendChild(btn);
       }
     }
@@ -2766,7 +3024,7 @@
       lastControlHolder = holder || null;
     });
     socket.on('control-denied', ({ reason }) => addStatusMessage('无法获取控制: ' + reason));
-    socket.on('kicked', ({ reason }) => { addStatusMessage(reason || '你已被管理员踢出'); setTimeout(() => location.href = '/', 2000); });
+    socket.on('kicked', ({ reason }) => { addStatusMessage(reason || '你已被管理员踢出'); setTimeout(() => goHome(), 2000); });
 
     // ── Agent 模式事件 ──────────────────────────────
     socket.on('agent:message', (msg) => {
@@ -2781,6 +3039,9 @@
           } else if (msg.subtype === 'interrupted') {
             addStatusMessage('查询已中断');
             setWorkState('idle');
+          } else if (msg.subtype === 'inject_state') {
+            document.querySelectorAll(`[data-inject-tag="${CSS.escape(msg.id || '')}"]`).forEach(t => { t.outerHTML = injectTagHtml({ id: msg.id, state: msg.state, reason: msg.reason }); });
+            if (msg.state === 'dropped' && msg.reason) addStatusMessage('⚡ ' + msg.reason);
           } else if (msg.subtype === 'info' && msg.message) {
             addStatusMessage(msg.message);
             // 同步计划模式状态到按钮
@@ -2811,7 +3072,7 @@
               const sel = buildSyntheticUserEl(msg.content);
               if (sel) addStatusMessage(sel.textContent);
             } else if (!kind) {
-              addInputMessage(msg.content);
+              addInputMessage(msg.content, msg.inject);
             }
             // caveat/noise：纯噪音，不渲染
           }
@@ -2870,6 +3131,8 @@
           // 关键：idle 放最后——渲染最终答复的 addAssistantMessage 会把状态置回 'working'，
           // 若在其之前置 idle 会被顶回「执行中」+ 取消按钮不复位。渲染全部完成后再回 idle。
           setWorkState('idle');
+          // 还有插话没被看到：AI 收尾后马上拿它开新一轮，界面别停在空闲
+          if (msg.injectPending) { setWorkState('thinking'); showThinking(); }
           // 收尾水位提示：server 在 result 上附带了刚从 transcript 反查的精确水位
           // （ctxTokens——claude 2.1.292 起 stream 的 assistant usage 被清零，前端自己算不了）。
           // 旧 server 无此字段时退回 _lastCtxTokens（老 CLI 的 assistant 流仍带真实 usage）。
@@ -3340,6 +3603,49 @@
       cmdInput.focus();
     }
 
+    // ── ⚡ 插话 ─────────────────────────────────────────────
+    // AI 忙时把输入（或一条草稿）直接送进正在干的这一轮：claude 在下一步（两次工具调用之间）看到它并调整，
+    // 不打断、不重启。服务端靠 claude 的回显确认「AI 已看到」，气泡上的标记随之更新。
+    function canInjectNow() {
+      return currentSession?.mode === 'agent' && !!currentSession.injectable && workState !== 'idle' && canTakeControl() && !_askCtlId && !_planCtl;
+    }
+    window.updateInjectBtn = function() {
+      const b = document.getElementById('inject-btn');
+      if (b) b.style.display = canInjectNow() ? '' : 'none';
+    };
+    function injectEmit(payload, onOk) {
+      if (!isController) {
+        if (canTakeControl()) socket.emit('take-control', { sessionId: SESSION_ID });
+        else { addStatusMessage('其他用户控制中，无法插话'); return; }
+      }
+      socket.emit('agent:inject', payload, (r) => {
+        if (!r?.ok) { addStatusMessage('⚡ 插话没发出去：' + (r?.error || '未知原因')); return; }
+        onOk && onOk(r);
+      });
+    }
+    window.injectFromInput = function() {
+      const text = cmdInput.value.trim();
+      if (!text && !_pendingImage && !_pendingFile) { addStatusMessage('先在输入框里写下要补充的话，再点 ⚡ 插话'); cmdInput.focus(); return; }
+      if (!canInjectNow()) { sendCommand(); return; }
+      const imgPath = _pendingImage?.path || null;
+      const filePath = _pendingFile?.path || null;
+      const fileName = _pendingFile?.name || '';
+      const display = imgPath ? `📷 ${text || '分析图片'}` : filePath ? `📎 ${fileName}${text ? ' ' + text : ''}` : text;
+      const prompt = imgPath
+        ? `用户上传了一张图片，路径是 ${imgPath}，请用 Read 工具读取这张图片。用户的要求是：${text || '描述图片内容'}`
+        : filePath
+        ? `用户上传了一个临时文件用于本次分析（不在项目文件树里），路径是 ${filePath}（原文件名 ${fileName}），请用合适的工具（如 Read）读取并分析它。用户的要求是：${text || '分析这个文件'}`
+        : text;
+      injectEmit({ prompt, display }, () => {
+        cmdInput.value = ''; cmdInput.style.height = 'auto';
+        clearPendingImage(); clearPendingFile();
+        cmdInput.focus();
+      });
+    };
+    window.injectDraft = function(id) {
+      injectEmit({ draftId: id }, async () => { closeInboxSheet(); await refreshInbox(); });
+    };
+
     // ── @ 文件引用补全 ─────────────────────────────────────────
     //   输入框里打出 @词（@ 后无空白）时浮出文件搜索层：递归搜会话目录、
     //   最近修改优先；选中把 @词 替换成真实相对路径。「让 AI 读某个文件」
@@ -3601,6 +3907,7 @@
     window.toggleControl = function() { if (isController) socket.emit('release-control', { sessionId: SESSION_ID }); else if (canTakeControl()) socket.emit('take-control', { sessionId: SESSION_ID }); };
 
     function updateControlUI(controlling, holderName) {
+      try { updateInjectBtn(); } catch {}
       isController = controlling;
       const badge = document.getElementById('control-badge');
       if (controlling) {
@@ -3624,7 +3931,7 @@
     // ── 会话内使用说明（精简版；完整版在首页 ❓ 帮助）──────────────
     // 快捷栏按钮说明：帮助面板和鼠标悬停提示共用这一份，加按钮时在这里补一句
     const SK_HELP = {
-      draft:    ['📥 草稿', 'AI 忙时先把想法存起来，干完再发；勾「自动接力」会在这一轮结束后自动发出。'],
+      draft:    ['📥 草稿', 'AI 忙时先把想法记下来排队：可拖动 / ↑↓ 排顺序、点文字直接改、多选合并或一起取回；开「依次自动发送」后每干完一轮自动发下一条；AI 忙时可「⚡ 插入」当前任务。'],
       folder:   ['📂 文件夹', '在这台电脑上用资源管理器打开本任务目录（后台/服务模式下不可用）。'],
       model:    ['模型', '切换 AI 模型。复杂任务用强模型，简单活换快模型更省；被安全检测误拦时也可换个模型再试。'],
       plan:     ['计划', '先让 AI 只调研、出方案、不改文件；你审批后再执行。再点一次「退出计划」可按方案执行或仅退出。'],
@@ -3636,7 +3943,7 @@
       followup: ['🔄 跟进', '长任务交出去后，AI 每说完一轮，隔一段时间自动替你问进度、让它接着干；判断全部完成就停（最多 5 次，每次都算一轮模型调用）。'],
       git:      ['提交', '查看改动并 git 提交 / 推送。'],
       memory:   ['记忆', '查看、编辑「项目说明」和 AI 的长期记忆，每次新对话都会带上；长期项目可一键让 AI 生成项目说明。'],
-      skills:   ['技能', '管理常用指令模板（/命令），一点就发；可自建。'],
+      skills:   ['技能', '把做事方法存成技能，以后一点就能复用：可从本次任务一键生成，分享给其他 myhi（文件 / 分享码 / 链接 / 团队仓库），导入前自动做安全检查。'],
       cost:     ['费用', '查看本次会话的 token 用量与花费。'],
     };
     document.querySelectorAll('.sk[data-sk]').forEach(b => { const h = SK_HELP[b.dataset.sk]; if (h && !b.title) b.title = h[1]; });
@@ -3657,7 +3964,8 @@
         <b>发消息</b>：像聊天一样把需求说清楚即可；触屏回车=换行，用发送键发送。<br>
         <b>让它读文件</b>：打 <b>@</b> 从本项目逐层浏览、打字搜索；项目外打 <b>@D:</b>、<b>@/</b>、<b>@~/</b> 按路径逐层浏览；选中插路径；或点「文件」面板的 <b>@</b> 引用。<br>
         <b>工具/思考</b>：AI 干活的过程默认折叠，点「🔧 N 个工具调用」展开看命令与输出。<br>
-        <b>AI 忙时</b>：输入框变「存草稿」，先记着干完取回；勾自动接力会自动发出。<br>
+        <b>AI 忙时</b>：想补充或提醒，点输入框右边「⚡ 插话」——不打断，AI 下一步就会看到并调整（气泡上显示「AI 已看到」）；不急的就回车「存草稿」排队，草稿里可排顺序、编辑、合并，开「依次自动发送」后每干完一轮自动发下一条，AI 忙时也能把草稿「⚡ 插入」当前任务。<br>
+        <b>看不懂就问</b>：在聊天里<b>选中</b>看不懂的词或一段话（手机长按选中），点「💡 解释」或「❓ 问一问」，答案在旁边小窗里，可以继续追问；这些问答<b>不会打扰正在干活的 AI</b>，想让它知道就点「👉 告诉 AI」。<br>
         <b>AI 提问 / 交方案</b>：AI 需要你拿主意时会弹出选项，选一个即可，也可「跳过，让 AI 自己决定」；收起后输入框上方「❓ AI 在等你回答」可再打开。<br>
         <b>定位旧消息</b>：电脑上鼠标移到聊天区，右下角 ☰ 可列出你发过的消息点击跳转；看完点底部「↓ 回到底部」一键回来。
         ${sec('顶栏')}
@@ -4277,7 +4585,10 @@
 
     // ── 辅助 ──────────────────────────────────────
     function updateViewers(count) { document.getElementById('viewer-count').textContent = count > 1 ? `${count} 人在线` : ''; }
-    window.goBack = function() { window.location.href = '/'; };
+    // 回首页走顶层窗口：电脑工作台里会话页是嵌在首页右侧的，只在嵌入框里跳 '/' 会把整个首页套进右侧
+    function goHome() { try { (window.top || window).location.href = '/'; } catch { window.location.href = '/'; } }
+    window.goHome = goHome;
+    window.goBack = function() { goHome(); };
 
     // ── 快速切换会话（免退出到首页）──────────────────────────
     function switchRelTime(ms) {
@@ -4356,7 +4667,7 @@
       const close = () => overlay.remove();
       overlay.addEventListener('click', (e) => { if (e.target === overlay) close(); });
       box.querySelector('#sw-cancel').onclick = close;
-      box.querySelector('#sw-home').onclick = () => { window.location.href = '/'; };
+      box.querySelector('#sw-home').onclick = () => { goHome(); };
       const bindRows = () => box.querySelectorAll('[data-sid]').forEach(row => row.onclick = () => {
         const sid = row.dataset.sid;
         if (sid && sid !== SESSION_ID) window.location.href = '/terminal/' + sid;
@@ -4641,6 +4952,7 @@
     });
     // 输入框上方的「AI 在等你」提示条：弹窗被收起后从这里再打开
     function renderPendingBar() {
+      try { updateInjectBtn(); } catch {}
       const bar = document.getElementById('pending-bar');
       if (!bar) return;
       const txt = _planCtl ? '📋 AI 提交了方案，等你审批' : _askCtlId ? '❓ AI 在等你回答一个问题' : '';
@@ -5052,16 +5364,14 @@
       const cb = document.getElementById('inbox-new-autosend');
       if (cb) cb.checked = false;
       clearInboxNewImage();
+      _ibSelMode = false; _ibSel.clear(); _ibEditing = null;
+      ibTab('this');
       await refreshInbox(false);
       renderInbox();
     };
     window.closeInboxSheet = function() {
       document.getElementById('inbox-sheet').classList.remove('open');
     };
-    window.toggleInboxOthers = function() {
-      const box = document.getElementById('inbox-others');
-      box.style.display = box.style.display === 'none' ? '' : 'none';
-    };
 
     function draftPreview(d) {
       const t = (d.text || '').replace(/\s+/g, ' ').trim();
@@ -5086,48 +5396,230 @@
       return sameDay ? hm : `${p2(d.getMonth() + 1)}-${p2(d.getDate())} ${hm}`;
     }
 
-    function renderInbox() {
-      const esc = (s) => String(s).replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
-      const titleEl = document.getElementById('inbox-this-title');
-      if (titleEl) titleEl.textContent = currentSession?.title || '本会话';
+    // ── 草稿面板（队列）─────────────────────────────
+    let _ibSelMode = false;           // 多选模式
+    const _ibSel = new Set();         // 选中的草稿 id
+    let _ibEditing = null;            // 正在就地编辑的草稿 id
+    let _ibIdleSince = Date.now();    // 最近一次变空闲的时刻：刚干完的几秒里自动接力还没发，别急着报「暂停」
+    let _ibPauseTimer = null;
+    const ibEsc = (s) => String(s).replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
 
+    window.ibTab = function(t) {
+      document.querySelectorAll('.ib-tabs button').forEach(b => b.classList.toggle('on', b.dataset.ibt === t));
+      document.getElementById('ib-pane-this').style.display = t === 'this' ? '' : 'none';
+      document.getElementById('ib-pane-others').style.display = t === 'others' ? '' : 'none';
+    };
+
+    function renderInbox() {
       const mine = myDrafts();
-      document.getElementById('inbox-this').innerHTML = mine.length ? mine.map(d => `
-        <div class="dr-item">
-          <div class="dr-text">${esc(draftPreview(d))}</div>
-          <div class="dr-meta">
-            <span title="${esc(new Date(d.createdAt).toLocaleString())}">🕒 ${draftTime(d.createdAt)} · ${draftAge(d.createdAt)}</span>
+      for (const id of [..._ibSel]) if (!mine.some(d => d.id === id)) _ibSel.delete(id);
+      document.getElementById('ib-n-this').textContent = mine.length ? `(${mine.length})` : '';
+      const autoN = mine.filter(d => d.autoSend).length;
+      const allAuto = mine.length > 0 && autoN === mine.length;
+      const autoAll = document.getElementById('ib-auto-all');
+      autoAll.checked = allAuto;
+      autoAll.indeterminate = autoN > 0 && !allAuto;
+      document.getElementById('ib-hint').textContent = !mine.length ? '还没有草稿。AI 忙时想到什么，先记在这里。'
+        : autoN ? `共 ${mine.length} 条，${autoN} 条会按顺序自动发送（绿色序号），每干完一轮发下一条`
+        : `共 ${mine.length} 条，按顺序排队。AI 干完后点「取回」发送`;
+      const selBtn = document.getElementById('ib-sel-btn');
+      selBtn.textContent = _ibSelMode ? '完成' : '☑ 多选';
+      selBtn.style.display = mine.length > 1 || _ibSelMode ? '' : 'none';
+      // 多选时只管勾选和批量操作，自动发送开关先藏起来；没草稿时也不显示
+      document.getElementById('ib-autoall').style.display = _ibSelMode || !mine.length ? 'none' : '';
+
+      // 暂停提示：有待自动发送的草稿，会话却已空闲一阵（上一轮被中断 / 出错时不会自动往下发）
+      clearTimeout(_ibPauseTimer);
+      const idleFor = Date.now() - _ibIdleSince;
+      const paused = autoN > 0 && workState === 'idle' && idleFor > 6000;
+      if (autoN > 0 && workState === 'idle' && !paused) _ibPauseTimer = setTimeout(() => { if (document.getElementById('inbox-sheet').classList.contains('open')) renderInbox(); }, 6100 - idleFor);
+      document.getElementById('ib-paused').style.display = paused ? 'flex' : 'none';
+
+      const n = mine.length;
+      document.getElementById('inbox-this').innerHTML = n ? mine.map((d, i) => {
+        const editing = _ibEditing === d.id;
+        const att = [d.images?.length ? `📷${d.images.length > 1 ? '×' + d.images.length : ''}` : '', d.files?.length ? `📎${d.files.length > 1 ? '×' + d.files.length : ''}` : ''].filter(Boolean).join(' ');
+        const lead = _ibSelMode
+          ? `<input type="checkbox" ${_ibSel.has(d.id) ? 'checked' : ''} onchange="ibPick('${d.id}', this.checked)">`
+          : `<span class="ib-handle" title="拖动排序" onmousedown="ibArmDrag(this)">⋮⋮</span>`;
+        const body = editing
+          ? `<div class="ib-edit"><textarea id="ib-edit-ta" spellcheck="false">${ibEsc(d.text || '')}</textarea>
+               <div><span style="font-size:0.64rem;color:var(--muted);margin-right:auto">Ctrl+Enter 保存 · Esc 取消</span>
+               <button class="dr-btn" onclick="ibEditCancel()">取消</button><button class="dr-btn take" onclick="ibEditSave('${d.id}')">保存</button></div></div>`
+          : `<div class="ib-text" onclick="${_ibSelMode ? `ibPick('${d.id}')` : `ibEdit('${d.id}')`}" title="${_ibSelMode ? '点选' : '点击编辑'}">${ibEsc((att ? att + ' ' : '') + ((d.text || '').trim() || '(仅附件)'))}</div>`;
+        const meta = editing ? '' : `<div class="ib-meta">
+            <span title="${ibEsc(new Date(d.createdAt).toLocaleString())}">🕒 ${draftTime(d.createdAt)}</span>
             ${d.source === 'busy' ? '<span class="dr-src">忙时自动存</span>' : ''}
-            <label style="cursor:pointer;color:${d.autoSend ? 'var(--yellow)' : 'var(--muted)'}"
-                   title="勾上后：本轮干完、会话空闲时自动发出这条（不用你在页面前）。默认关。">
-              <input type="checkbox" ${d.autoSend ? 'checked' : ''} onchange="toggleAutoSend('${d.id}', this.checked)"
-                     style="vertical-align:-1px"> 自动接力
-            </label>
-            <span class="dr-acts">
-              <button class="dr-btn take" onclick="useDraft('${d.id}')" title="取回到消息框，草稿随即删除">取回</button>
-              <button class="dr-btn" onclick="deleteDraft('${d.id}')">删</button>
-            </span>
-          </div>
-        </div>`).join('')
-        : '<div style="color:var(--muted);font-size:0.75rem;padding:0.5rem">（本任务暂无草稿）</div>';
+            ${d.mergedFrom?.length ? `<span class="dr-src">由 ${d.mergedFrom.length} 条合并 · <a style="cursor:pointer;text-decoration:underline" onclick="ibUnmerge('${d.id}')">撤销合并</a></span>` : ''}
+            <button class="ib-chip ${d.autoSend ? 'on' : ''}" onclick="toggleAutoSend('${d.id}', ${!d.autoSend})" title="${d.autoSend ? '这条会在轮到它时自动发出。点一下取消' : '点一下：轮到这条时自动发出'}">⚡ ${d.autoSend ? '自动' : '手动'}</button>
+            ${_ibSelMode ? '' : `<span class="ib-acts">
+              <button class="ib-ic" ${i === 0 ? 'disabled' : ''} onclick="ibMove('${d.id}', -1)" title="上移">↑</button>
+              <button class="ib-ic" ${i === n - 1 ? 'disabled' : ''} onclick="ibMove('${d.id}', 1)" title="下移">↓</button>
+              <button class="ib-ic" onclick="ibDelete('${d.id}')" title="删除">🗑</button>
+              ${canInjectNow() ? `<button class="dr-btn" style="color:var(--yellow);border:1px solid var(--yellow);background:rgba(210,153,34,0.12)" onclick="injectDraft('${d.id}')" title="AI 正在干活：不打断，马上把这条送过去，AI 下一步就会看到">⚡ 插入</button>` : ''}
+              <button class="dr-btn take" onclick="useDraft('${d.id}')" title="放回消息框，草稿随即出队">取回</button>
+            </span>`}
+          </div>`;
+        return `<div class="ib-item ${_ibSel.has(d.id) ? 'sel' : ''}" data-id="${d.id}">${lead}<span class="ib-no ${d.autoSend ? 'auto' : ''}" title="${d.autoSend ? '第 ' + (i + 1) + ' 条 · 自动发送' : '第 ' + (i + 1) + ' 条'}">${i + 1}</span><div class="ib-main">${body}${meta}</div></div>`;
+      }).join('') : '<div style="color:var(--muted);font-size:0.75rem;padding:1.2rem 0.5rem;text-align:center">本任务暂无草稿</div>';
+
+      const selbar = document.getElementById('ib-selbar');
+      selbar.style.display = _ibSelMode ? 'flex' : 'none';
+      document.getElementById('ib-sel-n').textContent = _ibSel.size;
+      selbar.querySelectorAll('button').forEach((b, k) => { if (k < 3) b.disabled = k < 2 ? _ibSel.size < (k === 0 ? 2 : 1) : !_ibSel.size; });
+
+      if (_ibEditing) {
+        const ta = document.getElementById('ib-edit-ta');
+        if (ta && document.activeElement !== ta) { ta.focus(); ta.setSelectionRange(ta.value.length, ta.value.length); }
+        if (ta) ta.onkeydown = (e) => {
+          if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); ibEditCancel(); }
+          else if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) { e.preventDefault(); ibEditSave(_ibEditing); }
+        };
+      }
+      ibBindDrag();
 
+      // 其它任务：按任务分组
       const others = otherDrafts();
-      document.getElementById('inbox-others-count').textContent = others.length ? `(${others.length})` : '(0)';
-      document.getElementById('inbox-others').innerHTML = others.length ? others.map(d => `
-        <div class="dr-item">
-          <div class="dr-sess">${esc(d.sessionTitle || '(未知任务)')}${d.projectName ? ' · ' + esc(d.projectName) : ''}${d.sessionAlive ? '' : ' <span style="color:var(--muted)">(已结束)</span>'}</div>
-          <div class="dr-text" style="color:var(--text2)">${esc(draftPreview(d))}</div>
-          <div class="dr-meta">
-            <span>🕒 ${draftTime(d.createdAt)} · ${draftAge(d.createdAt)}</span>
-            <span class="dr-acts">
-              <button class="dr-btn" onclick="reassignDraft('${d.id}')" title="改投到本任务">改投</button>
-              <button class="dr-btn" onclick="deleteDraft('${d.id}')">删</button>
-            </span>
-          </div>
-        </div>`).join('')
-        : '<div style="color:var(--muted);font-size:0.75rem;padding:0.5rem">（没有其它任务的草稿）</div>';
+      document.getElementById('inbox-others-count').textContent = others.length ? `(${others.length})` : '';
+      const groups = new Map();
+      for (const d of others) { const k = d.sessionId; if (!groups.has(k)) groups.set(k, []); groups.get(k).push(d); }
+      document.getElementById('inbox-others').innerHTML = others.length ? [...groups.values()].map(g => `
+        <div class="ib-grp">${ibEsc(g[0].sessionTitle || '(未知任务)')}${g[0].projectName ? ' · ' + ibEsc(g[0].projectName) : ''}${g[0].sessionAlive ? '' : ' <span style="color:var(--muted);font-weight:400">(已结束)</span>'}</div>
+        ${g.map(d => `<div class="ib-item"><div class="ib-main">
+          <div class="ib-text" style="cursor:default;color:var(--text2)">${ibEsc(draftPreview(d))}</div>
+          <div class="ib-meta"><span>🕒 ${draftTime(d.createdAt)} · ${draftAge(d.createdAt)}</span>
+            <span class="ib-acts"><button class="ib-ic" onclick="deleteDraft('${d.id}')" title="删除">🗑</button>
+            <button class="dr-btn" onclick="reassignDraft('${d.id}')" title="挪到本任务，排到队尾">改投到本任务</button></span></div>
+        </div></div>`).join('')}`).join('')
+        : '<div style="color:var(--muted);font-size:0.75rem;padding:1.2rem 0.5rem;text-align:center">没有其它任务的草稿</div>';
+    }
+
+    async function ibReload() { await refreshInbox(); renderInbox(); }
+    async function ibPost(url, body) {
+      const r = await fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body || {}) });
+      const d = await r.json().catch(() => ({}));
+      if (!r.ok || d.error) throw new Error(d.error || ('HTTP ' + r.status));
+      return d;
+    }
+
+    // 就地编辑
+    window.ibEdit = function(id) { _ibEditing = id; renderInbox(); };
+    window.ibEditCancel = function() { _ibEditing = null; renderInbox(); };
+    window.ibEditSave = async function(id) {
+      const ta = document.getElementById('ib-edit-ta');
+      const text = ta ? ta.value : '';
+      const d = myDrafts().find(x => x.id === id);
+      if (!text.trim() && !d?.images?.length && !d?.files?.length) { addStatusMessage('草稿不能为空；不要了可以删除'); return; }
+      try {
+        await fetch('/api/inbox/' + id, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ text }) });
+      } catch { addStatusMessage('保存失败，请重试'); return; }
+      _ibEditing = null;
+      await ibReload();
+    };
+
+    // 排序：↑↓（手机）/ 拖动（电脑）都汇成「新顺序」提交
+    async function ibSaveOrder(ids) {
+      const byId = new Map(_inboxCache.drafts.map(d => [d.id, d]));
+      // 先本地生效再提交，拖动 / 连点 ↑↓ 不卡
+      const mine = ids.map(id => byId.get(id)).filter(Boolean);
+      _inboxCache.drafts = _inboxCache.drafts.filter(d => d.sessionId !== SESSION_ID).concat(mine);
+      renderInbox();
+      try { await ibPost('/api/inbox/reorder', { sessionId: SESSION_ID, ids }); } catch (e) { addStatusMessage('保存顺序失败：' + e.message); }
+      await ibReload();
+    }
+    window.ibMove = function(id, dir) {
+      const ids = myDrafts().map(d => d.id);
+      const i = ids.indexOf(id), j = i + dir;
+      if (i < 0 || j < 0 || j >= ids.length) return;
+      [ids[i], ids[j]] = [ids[j], ids[i]];
+      ibSaveOrder(ids);
+    };
+    window.ibArmDrag = function(h) { const it = h.closest('.ib-item'); if (it) it.draggable = true; };
+    let _ibDragId = null;
+    function ibBindDrag() {
+      document.querySelectorAll('#inbox-this .ib-item').forEach(it => {
+        it.ondragstart = (e) => { _ibDragId = it.dataset.id; it.classList.add('dragging'); e.dataTransfer.effectAllowed = 'move'; try { e.dataTransfer.setData('text/plain', _ibDragId); } catch {} };
+        it.ondragend = () => { it.draggable = false; it.classList.remove('dragging'); _ibDragId = null; document.querySelectorAll('.ib-item').forEach(x => x.classList.remove('drag-over-top', 'drag-over-bottom')); };
+        it.ondragover = (e) => {
+          if (!_ibDragId || it.dataset.id === _ibDragId) return;
+          e.preventDefault();
+          const r = it.getBoundingClientRect(), top = e.clientY < r.top + r.height / 2;
+          it.classList.toggle('drag-over-top', top); it.classList.toggle('drag-over-bottom', !top);
+        };
+        it.ondragleave = () => it.classList.remove('drag-over-top', 'drag-over-bottom');
+        it.ondrop = (e) => {
+          e.preventDefault();
+          if (!_ibDragId || it.dataset.id === _ibDragId) return;
+          const top = it.classList.contains('drag-over-top');
+          const ids = myDrafts().map(d => d.id).filter(x => x !== _ibDragId);
+          ids.splice(ids.indexOf(it.dataset.id) + (top ? 0 : 1), 0, _ibDragId);
+          ibSaveOrder(ids);
+        };
+      });
     }
 
+    // 多选
+    window.ibToggleSelect = function(on) {
+      _ibSelMode = typeof on === 'boolean' ? on : !_ibSelMode;
+      _ibSel.clear(); _ibEditing = null;
+      renderInbox();
+    };
+    window.ibPick = function(id, on) {
+      if (on === undefined) on = !_ibSel.has(id);
+      on ? _ibSel.add(id) : _ibSel.delete(id);
+      renderInbox();
+    };
+    window.ibMergeSelected = async function(take) {
+      const ids = myDrafts().map(d => d.id).filter(id => _ibSel.has(id));   // 按列表顺序
+      if (!ids.length) return;
+      if (ids.length === 1) { if (take) { _ibSelMode = false; _ibSel.clear(); return useDraft(ids[0]); } return; }
+      let merged;
+      try { merged = (await ibPost('/api/inbox/merge', { ids })).draft; }
+      catch (e) { addStatusMessage('合并失败：' + e.message); return; }
+      _ibSelMode = false; _ibSel.clear();
+      await refreshInbox();
+      if (take) return useDraft(merged.id);
+      _ibEditing = merged.id;
+      renderInbox();
+      addStatusMessage(`📥 已把 ${ids.length} 条合并成一条，可以直接改；不满意可点「撤销合并」`);
+    };
+    window.ibDeleteSelected = async function() {
+      const ids = [..._ibSel];
+      if (!ids.length || !confirm(`删除选中的 ${ids.length} 条草稿？`)) return;
+      for (const id of ids) { try { await fetch('/api/inbox/' + id, { method: 'DELETE' }); } catch {} }
+      _ibSelMode = false; _ibSel.clear();
+      await ibReload();
+    };
+    window.ibDelete = async function(id) {
+      const d = myDrafts().find(x => x.id === id);
+      if (d && (d.text || '').trim().length > 20 && !confirm('删除这条草稿？\n\n' + d.text.trim().slice(0, 80))) return;
+      await deleteDraft(id);
+    };
+    window.ibUnmerge = async function(id) {
+      try { await ibPost('/api/inbox/' + id + '/unmerge'); } catch (e) { addStatusMessage('撤销合并失败：' + e.message); return; }
+      _ibEditing = null;
+      await ibReload();
+      addStatusMessage('📥 已撤销合并，原来的几条已放回');
+    };
+
+    // 依次自动发送：整队开 / 关
+    window.ibAutoAll = async function(on) {
+      const mine = myDrafts();
+      const targets = mine.filter(d => !!d.autoSend !== on);
+      if (on && !confirm(`按顺序自动发送 ${mine.length} 条草稿？\n\n每干完一轮自动发下一条，共约 ${mine.length} 轮模型调用。\n上一轮被中断或出错时会暂停，等你确认再继续。`)) { renderInbox(); return; }
+      for (const d of targets) {
+        try { await fetch('/api/inbox/' + d.id, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ autoSend: on }) }); } catch {}
+      }
+      await ibReload();
+      addStatusMessage(on ? (workState === 'idle' ? '📥 已开启依次自动发送，马上发出第 1 条' : '📥 已开启依次自动发送：本轮干完后从第 1 条开始') : '📥 已关闭自动发送');
+    };
+    window.ibResume = async function() {
+      try { await ibPost('/api/inbox/resume', { sessionId: SESSION_ID }); } catch (e) { addStatusMessage('继续失败：' + e.message); return; }
+      _ibIdleSince = Date.now();
+      renderInbox();
+      addStatusMessage('📥 继续按顺序发送草稿');
+    };
+
     // ── 抽屉内就地新增草稿（不必先在消息框打字再"提取"）──────────
     let _inboxNewImage = null;   // { path, name }
 
@@ -5215,13 +5707,16 @@
     window.useDraft = async function(id) {
       const d = _inboxCache.drafts.find(x => x.id === id);
       if (!d) return;
-      cmdInput.value = d.text || '';
+      // 消息框一次只能挂一张图 / 一个文件：合并来的多余附件以路径写进文字里，AI 照样会读
+      const extra = [...(d.images || []).slice(1).map(a => `另附图片 ${a.path}，请用 Read 工具读取。`),
+                     ...(d.files || []).slice(d.images?.length ? 0 : 1).map(a => `另附文件 ${a.path}（原文件名 ${a.name}），请读取分析。`)];
+      cmdInput.value = (d.text || '') + (extra.length ? '\n' + extra.join('\n') : '');
       cmdInput.style.height = 'auto';
       cmdInput.style.height = Math.min(cmdInput.scrollHeight, 200) + 'px';
       clearPendingImage();
       clearPendingFile();
       if (d.images?.length) setPendingImage(d.images[0].path, '');
-      if (d.files?.length) {
+      else if (d.files?.length) {
         _pendingFile = { path: d.files[0].path, name: d.files[0].name };
         const fp = document.getElementById('file-preview');
         const nameEl = document.getElementById('file-preview-name');
@@ -5551,6 +6046,7 @@
         const customs = _customSkills.filter(s => s.source !== 'builtin');
         // 内置技能：始终逐个显示（青绿色）
         const builtinEl = document.getElementById('sk-builtin-skills');
+        loadSubs();   // 团队仓库有更新时快捷栏「技能」按钮带个绿点
         builtinEl.innerHTML = builtins.map(s =>
           `<button class="sk sk-claude" onclick="runSkill('${escHtml(s.name)}')" title="${escHtml(s.desc)}" style="color:var(--teal)">/${escHtml(s.name)}</button>`
         ).join('');
@@ -5559,14 +6055,15 @@
         if (!customs.length) { customEl.innerHTML = ''; return; }
         if (customs.length <= 3) {
           customEl.innerHTML = customs.map(s =>
-            `<button class="sk sk-claude" onclick="runSkill('${escHtml(s.name)}')" title="${escHtml(s.desc)}" style="color:var(--purple2)">/${escHtml(s.name)}</button>`
+            `<button class="sk sk-claude" onclick="runSkill('${escHtml(s.name)}', false, '${s.kind || 'command'}')" title="${escHtml(s.desc)}${s.kind === 'skill' ? '（自动技能：AI 也会在合适时自己用）' : ''}" style="color:var(--purple2)">${s.kind === 'skill' ? '🧠' : '/'}${escHtml(s.name)}</button>`
           ).join('');
         } else {
           customEl.innerHTML = `<button class="sk sk-claude" onclick="openCmdSheet()" style="color:var(--purple2)">/命令 (${customs.length})</button>`;
         }
       } catch {}
     }
-    window.runSkill = function(name, skipPrompt) {
+    window.runSkill = function(name, skipPrompt, kind) {
+      _pendingSkillKind = kind || _customSkills.find(s => s.name === name)?.kind || 'command';
       // 直接运行（从弹窗确认后调用 skipPrompt=true）
       if (skipPrompt) {
         if (!isController && canTakeControl()) socket.emit('take-control', { sessionId: SESSION_ID });
@@ -5577,10 +6074,10 @@
         return;
       }
       // 先弹窗让用户补充要求
-      const skill = _customSkills.find(s => s.name === name);
+      const skill = _customSkills.find(s => s.name === name && (s.kind || 'command') === _pendingSkillKind);
       openSkillRunSheet(name, skill?.desc);
     };
-    let _pendingSkillName = null;
+    let _pendingSkillName = null, _pendingSkillKind = 'command';
     window.openSkillRunSheet = function(name, desc) {
       _pendingSkillName = name;
       const sheet = document.getElementById('skill-run-sheet');
@@ -5602,6 +6099,13 @@
       closeSkillRunSheet();
       if (!isController && canTakeControl()) socket.emit('take-control', { sessionId: SESSION_ID });
       const displayCmd = args ? `/${name} ${args}` : `/${name}`;
+      if (_pendingSkillKind === 'skill') {
+        // 自动技能（Agent 技能）没有 /命令：明确请 AI 用它
+        socket.emit('agent:query', { prompt: `请使用「${name}」技能${args ? '完成：' + args : '。'}` });
+        addInputMessage(`🧠 ${name}${args ? ' ' + args : ''}`);
+        showThinking();
+        return;
+      }
       if (skill?.source === 'builtin') {
         // 内置技能不在 .claude/commands/ 里，需拉取内容后直接发送为 prompt
         try {
@@ -5634,8 +6138,8 @@
         const filtered = _customSkills.filter(s =>
           s.source !== 'builtin' && (!kw || s.name.toLowerCase().includes(kw) || (s.desc || '').toLowerCase().includes(kw)));
         listEl.innerHTML = filtered.length
-          ? filtered.map(s => `<div class="action-sheet-item" onclick="runSkillAndClose('${escHtml(s.name)}')">
-              <div><div style="color:var(--purple3)">/${escHtml(s.name)}</div>${s.desc ? `<div class="desc">${escHtml(s.desc)}</div>` : ''}</div>
+          ? filtered.map(s => `<div class="action-sheet-item" onclick="runSkillAndClose('${escHtml(s.name)}', '${s.kind || 'command'}')">
+              <div><div style="color:var(--purple3)">${s.kind === 'skill' ? '🧠 ' : '/'}${escHtml(s.name)}</div>${s.desc ? `<div class="desc">${escHtml(s.desc)}</div>` : ''}</div>
             </div>`).join('')
           : '<div style="text-align:center;color:var(--muted);padding:1.5rem 0;font-size:0.82rem">无匹配命令</div>';
       };
@@ -5647,9 +6151,9 @@
     window.closeCmdSheet = function() {
       document.getElementById('cmd-sheet').classList.remove('open');
     };
-    window.runSkillAndClose = function(name) {
+    window.runSkillAndClose = function(name, kind) {
       closeCmdSheet();
-      runSkill(name);
+      runSkill(name, false, kind);
     };
     // 加入会话后加载 skill
     socket.on('joined', () => {
@@ -5661,252 +6165,440 @@
       if (document.getElementById('inbox-sheet')?.classList.contains('open')) renderInbox();
     });
 
-    // ── 技能管理 ──────────────────────────────────
-    let _editingSkill = null; // 编辑中的技能名，null 表示新建
-
+    // ── 技能管理（见 src/skills.js）────────────────────────
+    //   手动技能 = Claude 的斜杠命令（.claude/commands/名.md）；自动技能 = Agent 技能（.claude/skills/名/SKILL.md，AI 自己调用）。
+    //   ✨ 从本次任务生成（AI 起草、确认后保存）、📤 分享（文件 / 分享码 / 链接 / 团队仓库）、📥 导入（先预览 + 安全扫描）、👥 团队仓库订阅。
+    let _editingSkill = null;     // 编辑中的 { name, source, kind }，null = 新建
+    let _sklAll = [], _sklDirs = null, _sklShare = null, _sklImp = null, _gitSkills = [], _sklSubs = [];
+    const SKL_TITLES = { list: '技能', edit: '编辑技能', gen: '✨ 从本次任务生成技能', share: '📤 分享技能', import: '📥 导入技能', team: '👥 团队技能仓库', market: '🛒 技能市场' };
+    const sklEsc = (s) => escHtml(String(s ?? '')).replace(/"/g, '&quot;').replace(/'/g, '&#39;');
+    const sklKindLabel = (k) => k === 'skill' ? '自动' : '手动';
+    const sklScopeLabel = (s) => s === 'project' ? '本项目' : s === 'user' ? '本机' : '内置';
+    async function sklJson(url, opts) {
+      const r = await fetch(url, opts);
+      const d = await r.json().catch(() => ({}));
+      if (!r.ok || d.ok === false || d.error) { const e = new Error(d.error || ('HTTP ' + r.status)); e.data = d; throw e; }
+      return d;
+    }
+    const sklPost = (url, body) => sklJson(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body || {}) });
+
+    window.sklView = function(v) {
+      for (const k of Object.keys(SKL_TITLES)) { const el = document.getElementById('skl-v-' + k); if (el) el.style.display = k === v ? '' : 'none'; }
+      document.getElementById('skill-sheet-title').textContent = SKL_TITLES[v] || '技能';
+      document.getElementById('skl-back').style.display = v === 'list' ? 'none' : '';
+      if (v === 'list') refreshSkillList();
+      if (v === 'team') renderSubs();
+      if (v === 'import') { document.getElementById('skl-imp-preview').innerHTML = ''; setTimeout(() => document.getElementById('skl-imp-text').focus(), 80); }
+    };
     window.openSkillSheet = async function() {
       document.getElementById('skill-sheet').classList.add('open');
-      document.getElementById('skill-list-view').style.display = '';
-      document.getElementById('skill-edit-view').style.display = 'none';
-      document.getElementById('skill-close-btn').style.display = '';
-      await refreshSkillList();
-    };
-    window.closeSkillSheet = function() {
-      document.getElementById('skill-sheet').classList.remove('open');
+      sklView('list');
     };
+    window.closeSkillSheet = function() { document.getElementById('skill-sheet').classList.remove('open'); };
+    window.backToSkillList = function() { sklView('list'); };
 
     async function refreshSkillList() {
       const listEl = document.getElementById('skill-list-view');
-      listEl.innerHTML = '<div style="text-align:center;color:var(--muted);padding:2rem 0">加载中...</div>';
+      listEl.innerHTML = '<div class="skl-empty">加载中…</div>';
       try {
-        const resp = await fetch(`/api/skills?sessionId=${SESSION_ID}&detail=1`);
-        const data = await resp.json();
-        const editable = (data.skills || []).filter(s => s.source !== 'builtin');
-        if (!editable.length) {
-          listEl.innerHTML = '<div style="text-align:center;color:var(--muted);padding:2rem 0">暂无技能，点击右上角 + 新建</div>';
-          return;
-        }
-        listEl.innerHTML = editable.map(s => `
-          <div class="action-sheet-item" style="gap:0.5rem">
-            <div style="min-width:0;flex:1;cursor:pointer" onclick="editSkill('${escHtml(s.name)}','${escHtml(s.source)}')">
-              <div style="color:var(--purple2);font-weight:500">/${escHtml(s.name)}</div>
-              <div class="desc">${escHtml(s.desc)} · ${s.source === 'project' ? '项目级' : '用户级'}</div>
-            </div>
-            <button onclick="deleteSkill('${escHtml(s.name)}','${escHtml(s.source)}')" style="background:none;border:none;color:var(--red);font-size:0.78rem;cursor:pointer;padding:0.3rem 0.5rem;white-space:nowrap">删除</button>
-          </div>
-        `).join('');
+        const data = await sklJson(`/api/skills?sessionId=${SESSION_ID}`);
+        _sklAll = data.skills || []; _sklDirs = data.dirs || null;
+        const own = _sklAll.filter(s => s.source !== 'builtin');
+        const group = (src, title) => {
+          const items = own.filter(s => s.source === src);
+          if (!items.length) return '';
+          return `<div class="skl-grp">${title}</div>` + items.map(s => `
+            <div class="skl-item">
+              <div class="skl-main" onclick="editSkill('${sklEsc(s.name)}','${s.source}','${s.kind}')" title="点击编辑">
+                <div><span class="skl-name">${s.kind === 'skill' ? '🧠 ' : '/'}${escHtml(s.name)}</span><span class="skl-tag ${s.kind}">${sklKindLabel(s.kind)}</span>${s.fileCount > 1 ? `<span class="skl-tag">${s.fileCount} 个文件</span>` : ''}</div>
+                <div class="skl-desc">${escHtml(s.desc || '（没有说明）')}</div>
+              </div>
+              <div class="skl-acts">
+                <button class="ib-ic" onclick="openSkillShare('${sklEsc(s.name)}','${s.source}','${s.kind}')" title="分享给其他 myhi">📤</button>
+                <button class="ib-ic" onclick="deleteSkill('${sklEsc(s.name)}','${s.source}','${s.kind}')" title="删除">🗑</button>
+              </div>
+            </div>`).join('');
+        };
+        listEl.innerHTML = own.length ? group('project', '本项目') + group('user', '本机所有项目')
+          : '<div class="skl-empty">还没有技能。<br>做完一件以后还会再做的事，点上面「✨ 从本次任务生成」，下次一点就能复用。</div>';
       } catch (e) {
-        listEl.innerHTML = `<div style="text-align:center;color:var(--red);padding:2rem 0">加载失败: ${e.message}</div>`;
+        listEl.innerHTML = `<div class="skl-empty" style="color:var(--red)">加载失败：${escHtml(e.message)}</div>`;
       }
+      sklCheckSubsQuietly();
     }
 
-    window.showSkillEditor = function(name, scope, content) {
-      _editingSkill = name || null;
-      document.getElementById('skill-list-view').style.display = 'none';
-      document.getElementById('skill-edit-view').style.display = '';
-      document.getElementById('skill-close-btn').style.display = 'none';
-      document.getElementById('skill-sheet-title').textContent = name ? `编辑 /${name}` : '新建技能';
-      document.getElementById('skill-name').value = name || '';
-      document.getElementById('skill-name').disabled = !!name;
-      document.getElementById('skill-scope').value = scope || 'user';
-      document.getElementById('skill-content').value = content || '# 技能标题\n\n在此输入技能指令...\n';
+    // ── 编辑 / 手写 ──
+    const SKL_TPL = {
+      command: '# 技能标题（一句话说明做什么）\n\n## 目标\n\n## 步骤\n1. \n2. \n\n## 注意事项\n\n（运行时用户补充的内容会替换下面的 $ARGUMENTS）\n$ARGUMENTS\n',
+      skill: '---\nname: {{name}}\ndescription: 什么时候该用这个技能（写清楚场景，AI 据此判断要不要用）\n---\n\n# 技能标题\n\n## 步骤\n1. \n2. \n\n## 注意事项\n',
     };
-
-    window.editSkill = async function(name, source) {
-      try {
-        const resp = await fetch(`/api/skills?sessionId=${SESSION_ID}&detail=1`);
-        const data = await resp.json();
-        const skill = data.skills?.find(s => s.name === name && s.source === source);
-        showSkillEditor(name, source, skill?.content || '');
-      } catch {}
+    window.sklKindChanged = function() {
+      const kind = document.getElementById('skill-kind').value;
+      const ta = document.getElementById('skill-content');
+      if (!_editingSkill && (!ta.value.trim() || Object.values(SKL_TPL).some(t => ta.value === t.replace('{{name}}', document.getElementById('skill-name').value.trim() || 'my-skill')))) {
+        ta.value = SKL_TPL[kind].replace('{{name}}', document.getElementById('skill-name').value.trim() || 'my-skill');
+      }
+      document.getElementById('skill-edit-hint').innerHTML = (kind === 'skill'
+        ? '自动技能：名字只能用<b>小写字母、数字和连字符</b>（如 weekly-report）；开头 <code>description</code> 写清楚<b>什么时候用</b>，AI 遇到这类场景会自己调用。辅助脚本等其他文件放在同目录（可让 AI 帮你加）。'
+        : '手动技能：名字用英文、数字、- _ .（a:b 可分组）；第一行标题会显示成说明；<code>$ARGUMENTS</code> 会换成运行时你补充的内容。') + '<div id="skl-name-fix"></div>';
+      sklNameCheck();
     };
-
-    window.backToSkillList = function() {
-      document.getElementById('skill-list-view').style.display = '';
-      document.getElementById('skill-edit-view').style.display = 'none';
-      document.getElementById('skill-import-view').style.display = 'none';
-      document.getElementById('skill-market-view').style.display = 'none';
-      document.getElementById('skill-close-btn').style.display = '';
-      document.getElementById('skill-sheet-title').textContent = '技能管理';
-      refreshSkillList();
+    // 自动技能名字不合规：实时提示并给出改好的名字（一点就用）
+    const sklSlug = (n) => (String(n || '').toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').replace(/anthropic|claude/g, 'ai').slice(0, 64).replace(/-+$/, '') || 'my-skill');
+    window.sklNameCheck = function() {
+      const box = document.getElementById('skl-name-fix');
+      if (!box) return;
+      const n = document.getElementById('skill-name').value.trim();
+      const kind = document.getElementById('skill-kind').value;
+      const bad = kind === 'skill' && n && (!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(n) || n.length > 64 || /anthropic|claude/.test(n));
+      box.innerHTML = bad ? `<span style="color:var(--yellow)">⚠️ 这个名字 Claude 可能认不出来，</span><a style="color:var(--blue2);cursor:pointer" onclick="document.getElementById('skill-name').value='${sklSlug(n)}';sklNameCheck()">改成 ${sklSlug(n)}</a>` : '';
+    };
+    document.getElementById('skill-name')?.addEventListener('input', () => sklNameCheck());
+    window.showSkillEditor = function(name, scope, content, kind) {
+      _editingSkill = name ? { name, source: scope, kind: kind || 'command' } : null;
+      sklView('edit');
+      document.getElementById('skill-sheet-title').textContent = name ? `编辑 ${kind === 'skill' ? '🧠 ' : '/'}${name}` : '手写新技能';
+      const n = document.getElementById('skill-name'); n.value = name || ''; n.disabled = !!name;
+      document.getElementById('skill-kind').value = kind || 'command';
+      document.getElementById('skill-kind').disabled = !!name;
+      document.getElementById('skill-scope').value = scope || 'project';
+      document.getElementById('skill-scope').disabled = !!name;
+      document.getElementById('skill-content').value = content || '';
+      sklKindChanged();
+    };
+    window.editSkill = async function(name, source, kind) {
+      try {
+        const d = await sklJson(`/api/skills/content?sessionId=${SESSION_ID}&name=${encodeURIComponent(name)}&source=${source}&kind=${kind}`);
+        showSkillEditor(name, source, d.content || '', kind);
+      } catch (e) { addStatusMessage('打开失败：' + e.message); }
     };
-
     window.saveSkill = async function() {
       const name = document.getElementById('skill-name').value.trim();
       const scope = document.getElementById('skill-scope').value;
+      const kind = document.getElementById('skill-kind').value;
       const content = document.getElementById('skill-content').value;
       if (!name) { addStatusMessage('请输入技能名称'); return; }
       if (!content.trim()) { addStatusMessage('请输入技能内容'); return; }
       try {
-        const resp = await fetch(`/api/skills?sessionId=${SESSION_ID}`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ name, scope, content }),
-        });
-        const data = await resp.json();
-        if (data.error) { addStatusMessage('保存失败: ' + data.error); return; }
-        addStatusMessage(`技能 /${name} 已保存`);
-        backToSkillList();
-        loadSkills(); // 刷新快捷栏按钮
-      } catch (e) {
-        addStatusMessage('保存失败: ' + e.message);
+        await sklPost(`/api/skills?sessionId=${SESSION_ID}`, { name, scope, content, kind });
+        addStatusMessage(`技能 ${kind === 'skill' ? '🧠 ' : '/'}${name} 已保存`);
+        sklView('list'); loadSkills();
+      } catch (e) { addStatusMessage('保存失败：' + e.message); }
+    };
+    window.deleteSkill = async function(name, source, kind) {
+      if (!confirm(`确定删除技能「${name}」？`)) return;
+      try {
+        await sklJson(`/api/skills?sessionId=${SESSION_ID}`, { method: 'DELETE', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ name, scope: source, kind }) });
+        addStatusMessage(`技能「${name}」已删除`);
+        refreshSkillList(); loadSkills();
+      } catch (e) { addStatusMessage('删除失败：' + e.message); }
+    };
+
+    // ── ✨ 从本次任务生成：交给当前任务的 AI（它最清楚刚才怎么做成的），先出草稿、确认后才写文件 ──
+    window.genSkillFromTask = function() {
+      if (currentSession?.mode !== 'agent') return addStatusMessage('只有 AI 任务里可以生成技能');
+      if (workState !== 'idle') return addStatusMessage('AI 正在干活，等这一轮结束再生成技能');
+      const hint = document.getElementById('skl-gen-hint').value.trim();
+      const kind = document.querySelector('input[name=skl-gen-kind]:checked').value;
+      const scope = document.querySelector('input[name=skl-gen-scope]:checked').value;
+      const dirs = _sklDirs?.[scope];
+      const dir = dirs ? (kind === 'skill' ? dirs.skill : dirs.command) : (scope === 'project' ? (kind === 'skill' ? '.claude/skills' : '.claude/commands') : (kind === 'skill' ? '~/.claude/skills' : '~/.claude/commands'));
+      const fmt = kind === 'skill'
+        ? `类型：Agent 技能（AI 遇到合适场景会自己调用）。在 ${dir}/<名称>/ 下建 SKILL.md：开头 YAML frontmatter 写 name（同目录名）和 description（用中文写清楚「什么场景该用这个技能」，AI 靠它判断）；正文写目标、分步骤做法、注意事项、完成标准。需要辅助脚本就放在同一目录，并在 SKILL.md 里写明怎么用。`
+        : `类型：斜杠命令（用户点按钮或输入 /名称 运行）。文件 ${dir}/<名称>.md：第一行是「# 中文标题」（myhi 拿它当说明），正文写目标、前提、分步骤做法、注意事项、完成标准；每次运行需要用户补充的内容用 $ARGUMENTS 表示。`;
+      const prompt = [
+        `请把本次会话里我们完成的工作提炼成一个可以复用的 Claude Code 技能${hint ? '，我的想法：' + hint : '（你判断最值得沉淀的那套做法）'}。`,
+        fmt,
+        kind === 'skill' ? '名称只能用小写字母、数字和连字符（如 deploy-test，不超过 64 个字符，不能含 anthropic / claude），目录名和 SKILL.md 里的 name 要一致。' : '名称用小写英文和连字符（如 deploy-test）。',
+        '把本项目特有的路径、名字、账号改成参数或说明，让它在别的项目、别的电脑上也能用；不要写入任何密码、token、密钥或客户的真实敏感信息。',
+        '先把完整草稿（含名称和每个文件的内容）贴出来问我是否保存（可以直接保存 / 我要修改）；我确认之后再写入文件。在我确认之前不要创建或修改任何文件。如果同名技能已经存在，先告诉我。',
+      ].join('\n');
+      closeSkillSheet();
+      if (!isController && canTakeControl()) socket.emit('take-control', { sessionId: SESSION_ID });
+      const display = `✨ 把本次任务的做法生成${kind === 'skill' ? '自动' : '手动'}技能（${scope === 'project' ? '本项目' : '本机所有项目'}）${hint ? '：' + hint : ''}`;
+      addInputMessage(display);
+      socket.emit('agent:query', { prompt, display });
+      showThinking();
+      _sklGenPending = scope;
+    };
+    let _sklGenPending = false;   // 生成中（存范围）：这轮结束刷新快捷栏的技能按钮，并让相关任务重新加载技能
+
+    // ── 📤 分享 ──
+    window.openSkillShare = function(name, source, kind) {
+      _sklShare = { name, source, kind, force: false };
+      sklView('share');
+      document.getElementById('skl-share-info').innerHTML = `<b>${kind === 'skill' ? '🧠 ' : '/'}${escHtml(name)}</b> <span class="skl-tag ${kind}">${sklKindLabel(kind)}</span><span class="skl-tag">${sklScopeLabel(source)}</span>`;
+      document.getElementById('skl-share-warn').style.display = 'none';
+      document.getElementById('skl-share-out').style.display = 'none';
+      document.getElementById('skl-pub-form').style.display = 'none';
+    };
+    function sklShareFail(e, retry) {
+      const w = document.getElementById('skl-share-warn');
+      if (e.data?.secrets) {
+        w.innerHTML = `⚠️ ${escHtml(e.message)}<div style="margin-top:0.35rem;display:flex;gap:0.4rem"><button class="dr-btn" onclick="editSkill('${sklEsc(_sklShare.name)}','${_sklShare.source}','${_sklShare.kind}')">去编辑</button><button class="dr-btn" id="skl-force-btn">确认没有敏感信息，继续</button></div>`;
+        w.style.display = '';
+        document.getElementById('skl-force-btn').onclick = () => { _sklShare.force = true; w.style.display = 'none'; retry(); };
+      } else addStatusMessage('分享失败：' + e.message);
+    }
+    const sklShareBody = () => ({ sessionId: SESSION_ID, name: _sklShare.name, source: _sklShare.source, kind: _sklShare.kind, force: _sklShare.force });
+    function sklOut(html) { const o = document.getElementById('skl-share-out'); o.innerHTML = html; o.style.display = ''; }
+    async function sklCopy(text, ok) {
+      try { await navigator.clipboard.writeText(text); addStatusMessage(ok); }
+      catch { const ta = document.createElement('textarea'); ta.value = text; document.body.appendChild(ta); ta.select(); try { document.execCommand('copy'); addStatusMessage(ok); } catch {} ta.remove(); }
+    }
+    window.sklShareDownload = async function() {
+      try {
+        const d = await sklPost('/api/skills/export', sklShareBody());
+        const blob = new Blob([JSON.stringify(d.pkg, null, 2)], { type: 'application/json' });
+        const a = document.createElement('a');
+        a.href = URL.createObjectURL(blob); a.download = d.pkg.name.replace(/:/g, '-') + '.myhiskill';
+        document.body.appendChild(a); a.click(); a.remove(); setTimeout(() => URL.revokeObjectURL(a.href), 2000);
+        sklOut('✓ 已下载 <b>' + escHtml(a.download) + '</b>。发给对方后，在对方 myhi 的「技能 → 📥 导入」里选择这个文件。');
+      } catch (e) { sklShareFail(e, sklShareDownload); }
+    };
+    window.sklShareCode = async function() {
+      try {
+        const d = await sklPost('/api/skills/export', sklShareBody());
+        await sklCopy(d.code, '分享码已复制');
+        sklOut(`✓ 分享码已复制（${d.code.length} 字符）。对方在「技能 → 📥 导入」里粘贴即可。<textarea class="slash-inp" rows="3" readonly style="width:100%;box-sizing:border-box;margin-top:0.35rem;font-size:0.7rem" onclick="this.select()">${escHtml(d.code)}</textarea>`);
+      } catch (e) { sklShareFail(e, sklShareCode); }
+    };
+    window.sklShareLink = async function() {
+      try {
+        const d = await sklPost('/api/skills/share-link', sklShareBody());
+        await sklCopy(d.url, '分享链接已复制');
+        sklOut(`✓ 链接已复制，<b>${new Date(d.expires).toLocaleString()}</b> 前有效。对方在「📥 导入」里粘贴（两台 myhi 要能互相访问）：<input class="slash-inp" readonly value="${sklEsc(d.url)}" style="width:100%;box-sizing:border-box;margin-top:0.35rem;font-size:0.72rem" onclick="this.select()">`);
+      } catch (e) { sklShareFail(e, sklShareLink); }
+    };
+    window.sklSharePublishForm = function() {
+      const f = document.getElementById('skl-pub-form');
+      f.style.display = f.style.display === 'none' ? '' : 'none';
+      const last = JSON.parse(localStorage.getItem('myhi_skl_pub') || 'null') || (_sklSubs[0] ? { url: _sklSubs[0].url, username: _sklSubs[0].username, branch: _sklSubs[0].branch } : {});
+      if (!document.getElementById('skl-pub-url').value) {
+        document.getElementById('skl-pub-url').value = last.url || '';
+        document.getElementById('skl-pub-user').value = last.username || '';
+        document.getElementById('skl-pub-branch').value = last.branch || '';
       }
     };
+    window.sklPublish = async function() {
+      const url = document.getElementById('skl-pub-url').value.trim();
+      if (!url) { addStatusMessage('请填写团队仓库地址'); return; }
+      const body = { ...sklShareBody(), url, username: document.getElementById('skl-pub-user').value.trim(), password: document.getElementById('skl-pub-pass').value, branch: document.getElementById('skl-pub-branch').value.trim() };
+      sklOut('发布中…（克隆仓库、提交、推送）');
+      try {
+        const d = await sklPost('/api/skills/publish', body);
+        localStorage.setItem('myhi_skl_pub', JSON.stringify({ url, username: body.username, branch: body.branch }));
+        sklOut(d.unchanged ? '仓库里已经是这个版本，不用重复发布。' : '✓ 已发布到团队仓库。订阅了这个仓库的 myhi「检查更新」时会看到。');
+      } catch (e) { document.getElementById('skl-share-out').style.display = 'none'; sklShareFail(e, sklPublish); }
+    };
 
-    window.deleteSkill = async function(name, source) {
-      if (!confirm(`确定删除技能 /${name}？`)) return;
+    // ── 📥 导入：分享码 / 分享链接 / 文件 → 预览 + 安全扫描 → 选范围安装 ──
+    window.sklImportFile = async function(file) {
+      if (!file) return;
+      const text = await file.text();
+      let body;
+      if (/\.md$/i.test(file.name)) {
+        // 直接给了一个 .md：按手动技能处理，名称取文件名
+        const name = file.name.replace(/\.md$/i, '').replace(/[^\w.-]+/g, '-');
+        body = { pkg: { myhiSkill: 1, kind: 'command', name, files: [{ path: name + '.md', content: text }] } };
+      } else if (text.trim().startsWith('MYHI-SKILL:')) body = { code: text };
+      else body = { pkg: text };
+      sklImportPreview(body);
+    };
+    window.sklImportPreview = async function(body) {
+      const box = document.getElementById('skl-imp-preview');
+      if (!body) {
+        const t = document.getElementById('skl-imp-text').value.trim();
+        if (!t) { addStatusMessage('先粘贴分享码 / 分享链接，或选择技能文件'); return; }
+        body = /^https?:\/\/\S+\/s\/skill\/[\w-]+/.test(t) ? { url: t.match(/https?:\/\/\S+\/s\/skill\/[\w-]+/)[0] } : { code: t };
+      }
+      box.innerHTML = '<div class="skl-empty">读取中…</div>';
       try {
-        const resp = await fetch(`/api/skills?sessionId=${SESSION_ID}`, {
-          method: 'DELETE',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ name, scope: source }),
-        });
-        const data = await resp.json();
-        if (data.error) { addStatusMessage('删除失败: ' + data.error); return; }
-        addStatusMessage(`技能 /${name} 已删除`);
-        refreshSkillList();
-        loadSkills();
+        const d = await sklPost('/api/skills/preview', { sessionId: SESSION_ID, ...body });
+        _sklImp = d;
+        const p = d.pkg;
+        const danger = d.findings.filter(f => f.level === 'danger'), warn = d.findings.filter(f => f.level === 'warn');
+        box.innerHTML = `
+          <div class="skl-card">
+            <div><b>${p.kind === 'skill' ? '🧠 ' : '/'}${escHtml(p.name)}</b> <span class="skl-tag ${p.kind}">${sklKindLabel(p.kind)}</span>${p.from ? `<span class="skl-tag">来自 ${escHtml(p.from)}</span>` : ''}</div>
+            <div class="skl-desc" style="margin-top:0.2rem">${escHtml(p.desc || '（没有说明）')}</div>
+            ${p.renamedFrom ? `<div class="skl-hint" style="color:var(--yellow)">原名「${escHtml(p.renamedFrom)}」不符合自动技能的命名规范，安装时改成「${escHtml(p.name)}」</div>` : ''}
+          </div>
+          ${sklFindingsHtml(d.findings)}
+          <details class="skl-files"><summary>查看全部内容（${p.files.length} 个文件）——安装前建议过一遍</summary>
+            ${p.files.map(f => `<div class="skl-fname">${escHtml(f.path)}</div><pre>${escHtml(f.content)}</pre>`).join('')}
+          </details>
+          <div class="skl-row" style="margin-top:0.5rem">
+            <select id="skl-imp-scope" class="slash-inp skl-sel" onchange="sklImpExists()">
+              <option value="project">只装到本项目</option>
+              <option value="user">装到本机所有项目</option>
+            </select>
+          </div>
+          <div id="skl-imp-exists" class="skl-hint"></div>
+          ${danger.length ? '<label class="skl-confirm"><input type="checkbox" id="skl-imp-ack"> 我已看过上面标红的内容，确认这个技能来源可信</label>' : ''}
+          <button class="action-sheet-cancel" style="background:${danger.length ? 'var(--red)' : 'var(--green)'};color:#fff;font-weight:600;margin-top:0.4rem" onclick="sklInstall()">${danger.length ? '⚠️ 仍然安装' : '安装'}</button>`;
+        // 带脚本的技能默认只装本项目
+        document.getElementById('skl-imp-scope').value = p.kind === 'skill' && p.files.length > 1 ? 'project' : (warn.length || danger.length ? 'project' : 'user');
+        sklImpExists();
       } catch (e) {
-        addStatusMessage('删除失败: ' + e.message);
+        box.innerHTML = `<div class="skl-warn">⚠️ ${escHtml(e.message)}</div>`;
       }
     };
-
-    // ── Git 安装技能 ──────────────────────────────
-    let _gitSkills = []; // 扫描到的技能列表
-
-    window.showSkillImport = function() {
-      document.getElementById('skill-list-view').style.display = 'none';
-      document.getElementById('skill-edit-view').style.display = 'none';
-      document.getElementById('skill-import-view').style.display = '';
-      document.getElementById('skill-close-btn').style.display = 'none';
-      document.getElementById('skill-sheet-title').textContent = '从 Git 安装技能';
-      document.getElementById('skill-import-preview').style.display = 'none';
-      document.getElementById('skill-import-install-btn').style.display = 'none';
-      document.getElementById('skill-import-scan-btn').innerHTML = '';
-      document.getElementById('skill-git-url').value = '';
-      _gitSkills = [];
-      setTimeout(() => document.getElementById('skill-git-url').focus(), 100);
+    function sklFindingsHtml(findings) {
+      if (!findings?.length) return '<div class="skl-ok">✓ 安全检查没发现可疑写法</div>';
+      return '<div class="skl-findings">' + findings.map(f => `<div class="skl-f ${f.level}">${f.level === 'danger' ? '⛔' : '⚠️'} ${escHtml(f.why)}${f.file ? ` <small>${escHtml(f.file)}${f.line ? ' 第 ' + f.line + ' 行' : ''}</small>` : ''}${f.text ? `<code>${escHtml(f.text)}</code>` : ''}</div>`).join('') + '</div>';
+    }
+    window.sklImpExists = function() {
+      if (!_sklImp) return;
+      const sc = document.getElementById('skl-imp-scope').value;
+      document.getElementById('skl-imp-exists').textContent = _sklImp.exists?.[sc] ? `⚠️ ${sc === 'project' ? '本项目' : '本机'}已经有同名技能，安装会覆盖它` : '';
+    };
+    window.sklInstall = async function() {
+      if (!_sklImp) return;
+      const ack = document.getElementById('skl-imp-ack');
+      if (ack && !ack.checked) { addStatusMessage('这个技能里有标红的可疑内容：确认来源可信后先勾选确认'); return; }
+      const scope = document.getElementById('skl-imp-scope').value;
+      try {
+        await sklPost('/api/skills/install', { sessionId: SESSION_ID, pkg: _sklImp.pkg, scope });
+        addStatusMessage(`已安装技能「${_sklImp.pkg.name}」（${scope === 'project' ? '本项目' : '本机所有项目'}），下一轮 AI 就能用`);
+        _sklImp = null; document.getElementById('skl-imp-text').value = '';
+        sklView('list'); loadSkills();
+      } catch (e) { addStatusMessage('安装失败：' + e.message); }
     };
 
-    document.getElementById('skill-git-url')?.addEventListener('keydown', (e) => {
-      if (e.key === 'Enter') { e.preventDefault(); scanGitSkills(); }
-    });
-
+    // ── 👥 团队仓库：订阅列表 / 检查更新 / 扫描安装 ──
+    async function loadSubs() { try { _sklSubs = (await sklJson('/api/skills/subs')).subs || []; } catch { _sklSubs = []; } updateSubBadge(); return _sklSubs; }
+    function updateSubBadge() {
+      const n = _sklSubs.reduce((a, s) => a + (s.updates?.length || 0), 0);
+      const b = document.getElementById('skl-upd-badge'), ban = document.getElementById('skl-upd-banner');
+      if (b) { b.textContent = n; b.style.display = n ? '' : 'none'; }
+      if (ban) { ban.textContent = `👥 团队仓库有 ${n} 个技能更新 / 新技能 · 点这里查看`; ban.style.display = n ? '' : 'none'; }
+      const skBtn = document.querySelector('#sk-claude-agent .sk[data-sk="skills"]');
+      if (skBtn) skBtn.classList.toggle('skl-dot', n > 0);
+    }
+    let _sklAutoChecked = false;
+    async function sklCheckSubsQuietly() {
+      await loadSubs();
+      if (_sklAutoChecked) return;
+      _sklAutoChecked = true;
+      for (const s of _sklSubs) {
+        if (Date.now() - (s.lastCheck || 0) < 6 * 3600 * 1000) continue;   // 6 小时内查过就不再查
+        try { await sklPost(`/api/skills/subs/${s.id}/check`); } catch {}
+      }
+      await loadSubs();
+    }
+    const maskUrl = (u) => String(u || '').replace(/\/\/[^@/]+@/, '//');
+    async function renderSubs() {
+      const box = document.getElementById('skl-subs');
+      await loadSubs();
+      box.innerHTML = _sklSubs.length ? '<div class="skl-lbl">已订阅</div>' + _sklSubs.map(s => `
+        <div class="skl-card skl-sub">
+          <div style="display:flex;align-items:center;gap:0.4rem">
+            <div style="flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="${sklEsc(maskUrl(s.url))}">${escHtml(maskUrl(s.url).replace(/^https?:\/\//, ''))}</div>
+            <span class="skl-tag">${s.scope === 'project' ? '本项目' : '本机'}</span>
+          </div>
+          <div class="skl-desc">已装 ${Object.keys(s.installed || {}).length} 个 · ${s.lastCheck ? '上次检查 ' + new Date(s.lastCheck).toLocaleString() : '还没检查过'}${s.updates?.length ? ` · <b style="color:var(--green)">${s.updates.length} 个更新</b>` : ''}</div>
+          <div class="skl-row" style="margin-top:0.35rem">
+            <button class="dr-btn take" onclick="sklSubCheck('${s.id}')">检查更新</button>
+            <button class="dr-btn" style="margin-left:auto" onclick="sklSubRemove('${s.id}')">取消订阅</button>
+          </div>
+          <div id="skl-sub-out-${s.id}"></div>
+        </div>`).join('') : '<div class="skl-hint">还没有订阅团队仓库。团队把技能放在一个 Git 仓库里（commands/、skills/ 目录），大家订阅后就能一起用、收到更新；也可以在技能的「📤 分享」里发布到仓库。</div>';
+    }
+    function sklPackListHtml(list, withStatus) {
+      return list.map((s, i) => `
+        <label class="skl-pick">
+          <input type="checkbox" ${s.findings?.some(f => f.level === 'danger') ? '' : 'checked'} data-key="${sklEsc(s.kind + ':' + s.name)}">
+          <div style="min-width:0;flex:1">
+            <div><span class="skl-name">${s.kind === 'skill' ? '🧠 ' : '/'}${escHtml(s.name)}</span><span class="skl-tag ${s.kind}">${sklKindLabel(s.kind)}</span>${withStatus ? `<span class="skl-tag ${s.status === 'new' ? 'skill' : ''}">${s.status === 'new' ? '新技能' : '有更新'}</span>` : ''}</div>
+            <div class="skl-desc">${escHtml(s.desc || '')}</div>
+            ${s.findings?.length ? sklFindingsHtml(s.findings) : ''}
+          </div>
+        </label>`).join('');
+    }
+    window.sklSubCheck = async function(id) {
+      const out = document.getElementById('skl-sub-out-' + id);
+      out.innerHTML = '<div class="skl-empty">检查中…</div>';
+      try {
+        const d = await sklPost(`/api/skills/subs/${id}/check`);
+        await loadSubs();
+        if (!d.updates.length) { out.innerHTML = '<div class="skl-ok">✓ 已是最新</div>'; return; }
+        out.innerHTML = sklPackListHtml(d.updates, true) + `<button class="action-sheet-cancel" style="background:var(--green);color:#fff;font-weight:600;margin-top:0.4rem" onclick="sklSubUpdate('${id}')">更新 / 安装选中的</button>`;
+      } catch (e) { out.innerHTML = `<div class="skl-warn">⚠️ ${escHtml(e.message)}</div>`; }
+    };
+    window.sklSubUpdate = async function(id) {
+      const names = [...document.querySelectorAll(`#skl-sub-out-${id} input[type=checkbox]:checked`)].map(c => c.dataset.key);
+      if (!names.length) { addStatusMessage('请至少选一个'); return; }
+      try {
+        const d = await sklPost('/api/skills/repo/install', { sessionId: SESSION_ID, subId: id, names });
+        addStatusMessage(`已更新 ${d.installed.length} 个技能`);
+        loadSkills(); renderSubs();
+      } catch (e) { addStatusMessage('更新失败：' + e.message); }
+    };
+    window.sklSubRemove = async function(id) {
+      if (!confirm('取消订阅这个仓库？已经装好的技能会保留。')) return;
+      try { await sklJson(`/api/skills/subs/${id}`, { method: 'DELETE' }); } catch {}
+      renderSubs();
+    };
+    document.getElementById('skill-git-url')?.addEventListener('keydown', (e) => { if (e.key === 'Enter') { e.preventDefault(); scanGitSkills(); } });
     window.scanGitSkills = async function() {
       const url = document.getElementById('skill-git-url').value.trim();
       if (!url) { addStatusMessage('请输入 Git 仓库地址'); return; }
-      const statusEl = document.getElementById('skill-import-scan-btn');
-      statusEl.innerHTML = '<div style="text-align:center;color:var(--muted);padding:0.5rem 0">正在克隆并扫描...</div>';
-      document.getElementById('skill-import-preview').style.display = 'none';
-      document.getElementById('skill-import-install-btn').style.display = 'none';
+      const box = document.getElementById('skill-import-preview');
+      box.innerHTML = '<div class="skl-empty">正在克隆并扫描…</div>';
       try {
-        const username = document.getElementById('skill-git-user').value.trim();
-        const password = document.getElementById('skill-git-pass').value;
-        const resp = await fetch('/api/skills/scan-git', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ url, username: username || undefined, password: password || undefined }),
-        });
-        const data = await resp.json();
-        statusEl.innerHTML = '';
-        if (data.error) { addStatusMessage(data.error); return; }
-        _gitSkills = data.skills || [];
-        if (!_gitSkills.length) {
-          addStatusMessage(data.message || '未找到技能文件');
-          return;
-        }
-        const preview = document.getElementById('skill-import-preview');
-        preview.innerHTML = _gitSkills.map((s, i) => `
-          <label style="display:flex;align-items:flex-start;gap:0.5rem;padding:0.4rem 0;border-bottom:1px solid var(--surface2);cursor:pointer">
-            <input type="checkbox" checked data-skill-idx="${i}" style="margin-top:0.15rem">
-            <div style="min-width:0;flex:1">
-              <div style="color:var(--purple2);font-weight:500">/${escHtml(s.name)}</div>
-              <div style="color:var(--muted);font-size:0.72rem">${escHtml(s.desc)}</div>
-            </div>
-          </label>
-        `).join('');
-        preview.style.display = '';
-        document.getElementById('skill-import-install-btn').style.display = '';
-      } catch (e) {
-        addStatusMessage('扫描失败: ' + e.message);
-        statusEl.innerHTML = '';
-      }
+        const d = await sklPost('/api/skills/repo/scan', { url, username: document.getElementById('skill-git-user').value.trim() || undefined, password: document.getElementById('skill-git-pass').value || undefined });
+        _gitSkills = d.skills || [];
+        if (!_gitSkills.length) { box.innerHTML = '<div class="skl-hint">这个仓库里没找到技能（commands/*.md、skills/*/SKILL.md）</div>'; return; }
+        box.innerHTML = sklPackListHtml(_gitSkills, false) +
+          '<label class="skl-confirm"><input type="checkbox" id="skl-git-sub" checked> 订阅这个仓库：以后有更新 / 新技能时提示我</label>' +
+          '<button class="action-sheet-cancel" style="background:var(--green);color:#fff;font-weight:600;margin-top:0.4rem" onclick="installGitSkills()">安装选中的技能</button>';
+      } catch (e) { box.innerHTML = `<div class="skl-warn">⚠️ ${escHtml(e.message)}</div>`; }
     };
-
     window.installGitSkills = async function() {
-      const scope = document.getElementById('skill-import-scope').value;
-      const checkboxes = document.querySelectorAll('#skill-import-preview input[type=checkbox]');
-      const selected = [];
-      checkboxes.forEach(cb => {
-        if (cb.checked) selected.push(_gitSkills[parseInt(cb.dataset.skillIdx)]);
-      });
-      if (!selected.length) { addStatusMessage('请至少选择一个技能'); return; }
-      const btn = document.getElementById('skill-import-install-btn');
-      btn.textContent = '安装中...';
-      btn.disabled = true;
-      let ok = 0, fail = 0;
-      for (const s of selected) {
-        try {
-          const resp = await fetch(`/api/skills?sessionId=${SESSION_ID}`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ name: s.name, scope, content: s.content }),
-          });
-          const data = await resp.json();
-          if (data.error) fail++;
-          else ok++;
-        } catch { fail++; }
-      }
-      addStatusMessage(`安装完成: ${ok} 个成功${fail ? `, ${fail} 个失败` : ''}`);
-      btn.textContent = '安装选中的技能';
-      btn.disabled = false;
-      backToSkillList();
-      loadSkills();
+      const names = [...document.querySelectorAll('#skill-import-preview input[data-key]:checked')].map(c => c.dataset.key);
+      if (!names.length) { addStatusMessage('请至少选择一个技能'); return; }
+      const dangerSel = _gitSkills.filter(s => names.includes(s.kind + ':' + s.name) && s.findings?.some(f => f.level === 'danger'));
+      if (dangerSel.length && !confirm(`选中的技能里有 ${dangerSel.length} 个带标红的可疑内容（${dangerSel.map(s => s.name).join('、')}）。确认来源可信、仍然安装？`)) return;
+      try {
+        const d = await sklPost('/api/skills/repo/install', {
+          sessionId: SESSION_ID, names, scope: document.getElementById('skill-import-scope').value,
+          url: document.getElementById('skill-git-url').value.trim(), username: document.getElementById('skill-git-user').value.trim() || undefined,
+          password: document.getElementById('skill-git-pass').value || undefined, subscribe: document.getElementById('skl-git-sub')?.checked,
+        });
+        addStatusMessage(`已安装 ${d.installed.length} 个技能${d.sub ? '，并订阅了这个仓库' : ''}`);
+        document.getElementById('skill-import-preview').innerHTML = '';
+        loadSkills(); renderSubs();
+      } catch (e) { addStatusMessage('安装失败：' + e.message); }
     };
 
-    // ── 技能市场 ──────────────────────────────────
+    // ── 🛒 技能市场（社区仓库，走团队仓库的扫描安装，默认不订阅）──
     const SKILL_MARKET = [
-      { name: 'Claude Command Suite', desc: '216+ 命令, 12 技能, 54 AI Agent — 全面的软件工程工作流', repo: 'qdhenry/Claude-Command-Suite', stars: '1k+', path: 'commands' },
-      { name: 'Production Commands', desc: '全栈开发、安全、数据/ML、DevOps 命令集', repo: 'wshobson/commands', stars: '500+', path: '' },
-      { name: 'Claude Slash Commands', desc: '轻量级常用命令集合，直接可用', repo: 'artemgetmann/claude-slash-commands', stars: '200+', path: '' },
-      { name: 'Claude Commands', desc: '自定义命令合集，附完整文档', repo: 'david-t-martel/claude-commands', stars: '100+', path: '' },
-      { name: 'Claude Code Skills', desc: '专业技能市场，生产级 Skill 合集', repo: 'daymade/claude-code-skills', stars: '100+', path: '' },
-      { name: 'My Claude Code', desc: '日常使用的精选命令和工作流', repo: 'vincenthopf/My-Claude-Code', stars: '50+', path: '' },
+      { name: 'Claude Command Suite', desc: '216+ 命令, 12 技能, 54 AI Agent — 全面的软件工程工作流', repo: 'qdhenry/Claude-Command-Suite', stars: '1k+' },
+      { name: 'Production Commands', desc: '全栈开发、安全、数据/ML、DevOps 命令集', repo: 'wshobson/commands', stars: '500+' },
+      { name: 'Claude Slash Commands', desc: '轻量级常用命令集合，直接可用', repo: 'artemgetmann/claude-slash-commands', stars: '200+' },
+      { name: 'Claude Commands', desc: '自定义命令合集，附完整文档', repo: 'david-t-martel/claude-commands', stars: '100+' },
+      { name: 'Claude Code Skills', desc: '专业技能市场，生产级 Skill 合集', repo: 'daymade/claude-code-skills', stars: '100+' },
+      { name: 'My Claude Code', desc: '日常使用的精选命令和工作流', repo: 'vincenthopf/My-Claude-Code', stars: '50+' },
     ];
-
     window.showSkillMarket = function() {
-      document.getElementById('skill-list-view').style.display = 'none';
-      document.getElementById('skill-edit-view').style.display = 'none';
-      document.getElementById('skill-import-view').style.display = 'none';
-      document.getElementById('skill-market-view').style.display = '';
-      document.getElementById('skill-close-btn').style.display = 'none';
-      document.getElementById('skill-sheet-title').textContent = '技能市场';
-
-      const list = document.getElementById('skill-market-list');
-      list.innerHTML = '<div style="font-size:0.72rem;color:var(--muted);padding:0.3rem 0.5rem;border-bottom:1px solid var(--surface2)">热门社区技能仓库 · 点击安装</div>' +
+      sklView('market');
+      document.getElementById('skill-market-list').innerHTML = '<div class="skl-hint">热门社区技能仓库 · 点一个扫描，选择要装的（安装前会做安全检查）</div>' +
         SKILL_MARKET.map((m, i) => `
-          <div class="action-sheet-item" style="gap:0.5rem">
-            <div style="min-width:0;flex:1;cursor:pointer" onclick="installFromMarket(${i})">
+          <div class="skl-item" style="cursor:pointer" onclick="installFromMarket(${i})">
+            <div class="skl-main">
               <div style="font-weight:500">${escHtml(m.name)} <span style="color:var(--muted);font-size:0.7rem">★ ${m.stars}</span></div>
-              <div class="desc">${escHtml(m.desc)}</div>
+              <div class="skl-desc">${escHtml(m.desc)}</div>
               <div style="color:var(--blue);font-size:0.68rem">${escHtml(m.repo)}</div>
             </div>
-          </div>
-        `).join('') +
-        '<div style="padding:0.6rem 0.5rem;font-size:0.72rem;color:var(--muted);border-top:1px solid var(--surface2)">' +
-        '更多: <a href="https://github.com/hesreallyhim/awesome-claude-code" target="_blank" style="color:var(--blue)">awesome-claude-code</a>' +
-        ' · <a href="https://skillsmp.com" target="_blank" style="color:var(--blue)">skillsmp.com</a>' +
-        ' · <a href="https://www.skillhub.club" target="_blank" style="color:var(--blue)">skillhub.club</a></div>';
+          </div>`).join('') +
+        '<div class="skl-hint" style="margin-top:0.5rem">更多：<a href="https://github.com/hesreallyhim/awesome-claude-code" target="_blank" style="color:var(--blue)">awesome-claude-code</a></div>';
     };
-
     window.installFromMarket = async function(idx) {
-      const m = SKILL_MARKET[idx];
-      const url = `https://github.com/${m.repo}.git`;
-      // 复用 Git 安装流程
-      showSkillImport();
-      document.getElementById('skill-git-url').value = url;
-      // 自动触发扫描
+      sklView('team');
+      document.getElementById('skill-git-url').value = `https://github.com/${SKILL_MARKET[idx].repo}.git`;
       await scanGitSkills();
+      const sub = document.getElementById('skl-git-sub'); if (sub) sub.checked = false;
     };
 
     // ── Git 提交推送 ──────────────────────────────
@@ -6129,10 +6821,189 @@
       ].join('');
       if (!isController && canTakeControl()) socket.emit('take-control', { sessionId: SESSION_ID });
       addInputMessage('📘 让 AI 生成项目说明');
-      socket.emit('agent:query', { prompt });
+      socket.emit('agent:query', { prompt, display: '📘 让 AI 生成项目说明' });
       showThinking();
     };
 
+    // ── 💡 问一问 ─────────────────────────────────────
+    // 在聊天里选中一段文字 → 浮出「解释 / 问一问 / 复制」；回答在旁边小窗里流式出现，可以继续追问。
+    // 服务端为每次提问起一个一次性的 claude（不带工具、不落会话），正在干活的 AI 看不到这些问答；
+    // 想让它知道就点「👉 告诉 AI」，把要点放进输入框由用户确认后发送。
+    const askPop = document.getElementById('ask-pop');
+    const askPanel = document.getElementById('ask-panel');
+    const askBody = document.getElementById('ask-body');
+    const askInput = document.getElementById('ask-input');
+    const askSendBtn = document.getElementById('ask-send');
+    const _askTouch = window.matchMedia('(hover: none)');
+    if (_askTouch.matches) askInput.placeholder = '继续问…';
+    let _askSel = null;        // 当前选区 { text, msgEl }
+    let _askThread = null;     // { selection, context, userAsk, items: [{ q, a, err, done }] }
+    let _askReq = null;        // 正在等回答的 reqId
+    const askClip = (s, n) => { s = String(s || '').trim(); return s.length > n ? s.slice(0, n) + '…' : s; };
+
+    function askHidePop() { askPop.classList.remove('show'); _askSel = null; }
+    function askCheckSelection() {
+      if (currentSession?.mode !== 'agent') return askHidePop();
+      const sel = window.getSelection();
+      const text = sel && !sel.isCollapsed ? sel.toString().trim() : '';
+      if (!text || !sel.rangeCount) return askHidePop();
+      const node = sel.anchorNode && (sel.anchorNode.nodeType === 1 ? sel.anchorNode : sel.anchorNode.parentElement);
+      const msgEl = node && node.closest && node.closest('#chat-area .msg');
+      if (!msgEl) return askHidePop();
+      _askSel = { text, msgEl };
+      askPop.classList.add('show');
+      const pw = askPop.offsetWidth, ph = askPop.offsetHeight;
+      if (_askTouch.matches) {
+        // 手机：系统自带的选择菜单在选区上方，工具条放到输入框上方，互不遮挡
+        const ia = document.getElementById('input-area').getBoundingClientRect();
+        askPop.style.left = Math.max(8, (window.innerWidth - pw) / 2) + 'px';
+        askPop.style.top = Math.max(8, ia.top - ph - 10) + 'px';
+      } else {
+        const r = sel.getRangeAt(0).getBoundingClientRect();
+        let top = r.top - ph - 8; if (top < 56) top = r.bottom + 8;
+        askPop.style.left = Math.min(window.innerWidth - pw - 8, Math.max(8, r.left + r.width / 2 - pw / 2)) + 'px';
+        askPop.style.top = top + 'px';
+      }
+    }
+    let _askSelTimer = null;
+    document.addEventListener('selectionchange', () => { clearTimeout(_askSelTimer); _askSelTimer = setTimeout(askCheckSelection, 250); });
+    chatArea.addEventListener('scroll', () => { if (askPop.classList.contains('show')) askCheckSelection(); }, { passive: true });
+
+    // 选区所在消息的上下文：消息原文（太长就截选区附近）+ 用户在它之前说的那句需求
+    function askContextOf(msgEl, selText) {
+      let ctx = (msgEl.innerText || '').trim();
+      if (ctx.length > 3000) {
+        const i = Math.max(0, ctx.indexOf(selText.slice(0, 50)));
+        ctx = ctx.slice(Math.max(0, i - 1500), i + 1500);
+      }
+      let userAsk = '';
+      for (let el = msgEl.previousElementSibling; el; el = el.previousElementSibling) {
+        if (el.classList.contains('msg-input')) { userAsk = (el.innerText || '').trim(); break; }
+      }
+      return { context: ctx, userAsk };
+    }
+
+    window.askFromSelection = function(custom) {
+      if (!_askSel) return;
+      const { text, msgEl } = _askSel;
+      const { context, userAsk } = askContextOf(msgEl, text);
+      askHidePop();
+      try { window.getSelection().removeAllRanges(); } catch {}
+      askCancel();
+      _askThread = { selection: text, context, userAsk, items: [] };
+      openAsk();
+      if (custom) { renderAsk(); askInput.focus(); }
+      else askSend('');
+    };
+    window.askCopySelection = function() {
+      if (!_askSel) return;
+      const t = _askSel.text;
+      (navigator.clipboard?.writeText(t) || Promise.reject()).then(() => addStatusMessage('已复制'), () => {
+        const ta = document.createElement('textarea'); ta.value = t; document.body.appendChild(ta); ta.select();
+        try { document.execCommand('copy'); addStatusMessage('已复制'); } catch {} ta.remove();
+      });
+      askHidePop();
+    };
+
+    function openAsk() {
+      askPanel.classList.add('open');
+      document.getElementById('ask-backdrop').classList.toggle('show', window.innerWidth <= 768);
+    }
+    window.closeAsk = function() {
+      askPanel.classList.remove('open');
+      document.getElementById('ask-backdrop').classList.remove('show');
+    };
+    function askCancel() {
+      if (_askReq) { socket.emit('aside:cancel'); _askReq = null; }
+      if (_askThread) _askThread.items.forEach(it => { if (!it.done) { it.done = true; if (!it.a) it.err = '已停止'; } });
+    }
+
+    function renderAsk() {
+      const t = _askThread;
+      if (!t) { askBody.innerHTML = ''; return; }
+      let html = `<div class="ask-quote">${escHtml(askClip(t.selection, 600))}</div>`;
+      t.items.forEach((it, i) => {
+        html += `<div class="ask-q"><span>${escHtml(it.q || '解释一下这段是什么意思')}</span></div>`;
+        if (it.err && !it.a) html += `<div class="ask-a err">⚠️ ${escHtml(it.err)}</div>`;
+        else html += `<div class="ask-a md" data-i="${i}">${it.a ? renderMarkdown(it.a) : '<span style="color:var(--muted)">思考中…</span>'}</div>`;
+        if (it.err && it.a) html += `<div class="ask-a err">⚠️ ${escHtml(it.err)}</div>`;
+        if (it.done && it.a) {
+          html += `<div class="ask-acts">${canTakeControl() ? `<button class="pri" onclick="askTellAI(${i})" title="把这段问答的要点放进输入框，你确认后再发给正在干活的 AI">👉 告诉 AI</button>` : ''}`
+            + `<button onclick="askCopyAnswer(${i})">📋 复制</button></div>`;
+        }
+      });
+      if (!t.items.length) html += '<div style="color:var(--muted);font-size:0.78rem">在下面输入你想问的，比如「这是什么意思？」「为什么要这样做？」「和 XX 有什么区别？」</div>';
+      askBody.innerHTML = html;
+      askBody.scrollTop = askBody.scrollHeight;
+      const busy = !!_askReq;
+      askSendBtn.textContent = busy ? '停止' : '发送';
+      askSendBtn.classList.toggle('stop', busy);
+    }
+
+    function askSend(q) {
+      const t = _askThread;
+      if (!t) return;
+      const history = t.items.filter(it => it.done && it.a).map(it => ({ q: it.q || '解释一下这段是什么意思', a: it.a }));
+      const it = { q, a: '', err: '', done: false };
+      t.items.push(it);
+      _askReq = 'a' + Date.now().toString(36) + Math.random().toString(36).slice(2, 6);
+      it.reqId = _askReq;
+      socket.emit('aside:ask', { reqId: _askReq, selection: t.selection, context: t.context, userAsk: t.userAsk, question: q, history });
+      renderAsk();
+    }
+    window.askSendOrStop = function() {
+      if (_askReq) { askCancel(); renderAsk(); return; }
+      const q = askInput.value.trim();
+      if (!q) { askInput.focus(); return; }
+      if (!_askThread) _askThread = { selection: '', context: '', userAsk: '', items: [] };
+      askInput.value = ''; askInput.style.height = '';
+      askSend(q);
+    };
+    askInput.addEventListener('keydown', (e) => {
+      if (e.key === 'Enter' && !e.shiftKey && !e.isComposing && !_askTouch.matches) { e.preventDefault(); askSendOrStop(); }
+      else if (e.key === 'Escape') { e.preventDefault(); closeAsk(); }
+    });
+    askInput.addEventListener('input', () => { askInput.style.height = 'auto'; askInput.style.height = Math.min(askInput.scrollHeight, 150) + 'px'; });
+    document.addEventListener('keydown', (e) => { if (e.key === 'Escape' && askPanel.classList.contains('open') && document.activeElement !== askInput) closeAsk(); });
+
+    const askItemOf = (reqId) => _askThread?.items.find(it => it.reqId === reqId);
+    socket.on('aside:delta', ({ reqId, text }) => {
+      const it = askItemOf(reqId);
+      if (!it || it.done) return;
+      it.a = text;
+      const el = askBody.querySelector(`.ask-a[data-i="${_askThread.items.indexOf(it)}"]`);
+      if (el) { const atBottom = askBody.scrollHeight - askBody.scrollTop - askBody.clientHeight < 40; el.innerHTML = renderMarkdown(text); if (atBottom) askBody.scrollTop = askBody.scrollHeight; }
+      else renderAsk();
+    });
+    socket.on('aside:done', ({ reqId, text, error, partial }) => {
+      const it = askItemOf(reqId);
+      if (_askReq === reqId) _askReq = null;
+      if (!it || it.done) { renderAsk(); return; }
+      it.done = true;
+      if (text) it.a = text;
+      else { it.a = partial || it.a; it.err = error || '没有拿到回答，稍后再试'; }
+      renderAsk();
+    });
+
+    // 👉 告诉 AI：把问答要点放进输入框（不直接发），用户补上自己的想法后再发给干活的 AI
+    window.askTellAI = function(i) {
+      const t = _askThread, it = t?.items[i];
+      if (!it) return;
+      const firstPara = askClip(String(it.a).split(/\n\s*\n/)[0].replace(/[#*`>]/g, ''), 200);
+      const about = t.selection ? `关于你刚才说的「${askClip(t.selection.replace(/\s+/g, ' '), 60)}」，` : '';
+      const asked = it.q ? `我问了一下「${askClip(it.q, 60)}」，` : '';
+      cmdInput.value = `${about}${asked}了解到：${firstPara}\n我的想法是：`;
+      cmdInput.dispatchEvent(new Event('input'));
+      if (window.innerWidth <= 768) closeAsk();
+      cmdInput.focus();
+      cmdInput.setSelectionRange(cmdInput.value.length, cmdInput.value.length);
+      addStatusMessage('已放进输入框，补上你的想法后发送给 AI');
+    };
+    window.askCopyAnswer = function(i) {
+      const a = _askThread?.items[i]?.a;
+      if (a) navigator.clipboard?.writeText(a).then(() => addStatusMessage('已复制回答'), () => {});
+    };
+
     window.analyzeMemory = function() {
       const scopeTxt = _memScope === 'all' ? '所有项目 + 全局' : '本项目';
       const prompt = [
@@ -6149,7 +7020,7 @@
       if (currentSession?.mode === 'agent') {
         if (!isController && canTakeControl()) socket.emit('take-control', { sessionId: SESSION_ID });
         addInputMessage('🤖 让 AI 过一遍记忆（找过时/重复/废弃）');
-        socket.emit('agent:query', { prompt });
+        socket.emit('agent:query', { prompt, display: '🤖 让 AI 过一遍记忆（找过时/重复/废弃）' });
         showThinking();
       } else {
         addStatusMessage('该功能仅在 agent(Claude) 会话可用');