@shgroup/dsh-serenity-hooks 1.26.3 → 1.26.4

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.26.3",
+  "version": "1.26.4",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：真实 DSH 工具 cc_fs/session/acc_msm/eap/neat/cce/handyman/session_rebuild/skiff_admin + 拦截缝机械约束（safe-mode/路径守卫）+ 高级设定面板（双端口网关/账号管理）+ Skiff 认知子集角色（实验性）。适配 DSH 公开版（0.1.0-rc，deepseek-ai/deepseek-harness）。",
   "engines": {

package/lib/index.js

@@ -11663,9 +11663,11 @@ function escapeHtml(s) {
 * ① 提取 `<think>…</think>` 块（占位符 \u0000T<idx>\u0000）
 * ② 正文与 think 内容**先 escapeHtml 再 marked.parse**（GFM + breaks）——markdown 语法不受
 *    转义影响，原始 HTML 注入被消除（安全）；代码块内 `<` 显示为实体（可接受）
-* ③ think 占位符还原为 `<details class="think">` 折叠卡（🧠 思考过程，默认收起）
+* ③ think 占位符：默认还原为 `<details class="think">` 折叠卡（🧠 思考过程，默认收起）；
+*    **hideThink=true（v1.26.4，public 口）→ 直接移除**（思考过程对普通用户不展示）
+* @param hideThink 为 true 时 `<think>` 内容完全不渲染（public 问答页体验）
 */
-function renderSkiffMarkdown(raw) {
+function renderSkiffMarkdown(raw, hideThink = false) {
 	const thinks = [];
 	const body = raw.replace(/<think>([\s\S]*?)<\/think>/gi, (_m, inner) => {
 		const idx = thinks.length;
@@ -11677,6 +11679,7 @@ function renderSkiffMarkdown(raw) {
 		gfm: true
 	});
 	return (typeof parsed === "string" ? parsed : "").replace(/\u0000T(\d+)\u0000/g, (_m, idx) => {
+		if (hideThink) return "";
 		const inner = thinks[Number(idx)] ?? "";
 		const innerHtml = inner === "" ? "" : f.parse(escapeHtml(inner), {
 			breaks: true,
@@ -12193,7 +12196,7 @@ async function handleAskParsed(ctx, ccc, body, res) {
 	const result = await askSkiff(ctx, agent, question, 0);
 	sendJson(res, 200, {
 		answer: result.answer,
-		answer_html: renderSkiffMarkdown(result.answer),
+		answer_html: renderSkiffMarkdown(result.answer, true),
 		sessionId: result.sessionId,
 		continued,
 		trajectory: result.trajectory
@@ -12228,39 +12231,77 @@ function publicAskContainerClosedHtml(name) {
 <p style="font-size:13px"><a href="/" style="color:#0ba875">返回容器列表</a></p>
 </body></html>`;
 }
-/** 页面基础样式（列表页 + 单容器页共用） */
+/** 页面基础样式（列表页 + 单容器页共用；v1.26.4 聊天 UI） */
 const ASK_CSS = `
-  :root { color-scheme: light dark; }
-  body { font-family: system-ui, -apple-system, sans-serif; margin: 0; padding: 24px; background: #f6f7f9; color: #1f2328; }
-  @media (prefers-color-scheme: dark) { body { background: #1a1b1e; color: #e6e6e6; } }
+  :root { color-scheme: light dark; --sp-green: #0ba875; --sp-green-dim: #059669; }
+  * { box-sizing: border-box; }
+  html, body { height: 100%; }
+  body { font-family: system-ui, -apple-system, sans-serif; margin: 0; background: #f6f7f9; color: #1f2328; }
+  @media (prefers-color-scheme: dark) { body { background: #16181c; color: #e6e6e6; } }
   main { max-width: 720px; margin: 0 auto; }
   h1 { font-size: 18px; margin: 0 0 4px; }
   .sub { opacity: .65; font-size: 13px; margin-bottom: 16px; }
-  label { font-size: 13px; font-weight: 600; display: block; margin: 12px 0 4px; }
-  input, select, textarea { width: 100%; box-sizing: border-box; padding: 8px 10px; border-radius: 8px; border: 1px solid #d0d7de; background: #fff; color: inherit; font-size: 14px; }
-  @media (prefers-color-scheme: dark) { input, select, textarea { background: #26282c; border-color: #3a3d42; } }
-  textarea { min-height: 72px; resize: vertical; }
-  button { margin-top: 12px; padding: 9px 18px; border-radius: 8px; border: 0; background: #0ba875; color: #fff; font-size: 14px; font-weight: 600; cursor: pointer; }
-  button:disabled { opacity: .55; cursor: wait; }
   .card { background: #fff; border: 1px solid #d0d7de; border-radius: 10px; padding: 14px 16px; margin-bottom: 10px; display: block; text-decoration: none; color: inherit; }
   @media (prefers-color-scheme: dark) { .card { background: #26282c; border-color: #3a3d42; } }
-  .card:hover { border-color: #0ba875; }
+  .card:hover { border-color: var(--sp-green); }
   .card .cname { font-weight: 600; font-size: 15px; }
   .card .cmeta { opacity: .6; font-size: 12px; margin-top: 2px; }
-  #answer { background: #fff; border: 1px solid #d0d7de; border-radius: 8px; padding: 12px; margin-top: 16px; font-size: 14px; line-height: 1.6; min-height: 48px; word-break: break-word; }
-  @media (prefers-color-scheme: dark) { #answer { background: #26282c; border-color: #3a3d42; } }
-  #answer p { margin: 6px 0; }
-  #answer h1, #answer h2, #answer h3 { margin: 12px 0 6px; font-size: 15px; }
-  #answer code { background: rgba(127,127,127,.14); border-radius: 4px; padding: 1px 5px; font-size: 13px; font-family: ui-monospace, monospace; }
-  #answer pre { background: rgba(127,127,127,.1); border-radius: 8px; padding: 10px 12px; overflow-x: auto; }
-  #answer ul, #answer ol { margin: 6px 0; padding-left: 22px; }
-  .err { color: #cf222e; white-space: pre-wrap; }
-  .muted { opacity: .6; font-size: 13px; }
-  details.think { margin: 8px 0; border: 1px solid rgba(210,153,34,.4); border-radius: 8px; background: rgba(210,153,34,.06); }
-  details.think summary { cursor: pointer; padding: 6px 10px; font-size: 12px; color: #d29922; font-weight: 600; }
   .empty { text-align: center; opacity: .7; padding: 24px 0; }
-  .back { display: inline-block; margin-bottom: 12px; font-size: 13px; color: #0ba875; text-decoration: none; }
-  .ccname { font-weight: 600; color: #0ba875; }
+  .ccname { font-weight: 600; color: var(--sp-green); }
+
+  /* ── 聊天布局（v1.26.4 体验升级：参考 ChatGPT/Claude 会话形态）── */
+  .chat { display: flex; flex-direction: column; height: 100vh; max-width: 720px; margin: 0 auto; }
+  .chatHead { display: flex; align-items: center; gap: 10px; padding: 10px 16px; border-bottom: 1px solid rgba(127,127,127,.18); background: rgba(127,127,127,.04); position: sticky; top: 0; z-index: 5; }
+  .chatHead .back { color: var(--sp-green); text-decoration: none; font-size: 13px; white-space: nowrap; }
+  .chatHead .title { font-weight: 600; font-size: 14px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+  .chatHead .spacer { flex: 1; }
+  .chatHead select { border: 1px solid rgba(127,127,127,.25); border-radius: 8px; background: transparent; color: inherit; padding: 4px 8px; font-size: 12px; }
+  .chatHead .newBtn { border: 1px solid rgba(127,127,127,.25); border-radius: 8px; background: transparent; color: inherit; padding: 4px 10px; font-size: 12px; cursor: pointer; white-space: nowrap; }
+  .chatHead .newBtn:hover { border-color: var(--sp-green); color: var(--sp-green); }
+  /* 消息流 */
+  .msgList { flex: 1; overflow-y: auto; padding: 18px 16px; display: flex; flex-direction: column; gap: 16px; }
+  .msg { display: flex; flex-direction: column; max-width: 88%; }
+  .msg.user { align-self: flex-end; align-items: flex-end; }
+  .msg.assistant { align-self: flex-start; align-items: flex-start; }
+  .msg .who { font-size: 11px; opacity: .55; margin-bottom: 4px; padding: 0 4px; }
+  .msg .bubble { padding: 10px 14px; border-radius: 14px; font-size: 14px; line-height: 1.65; word-break: break-word; white-space: normal; }
+  .msg.user .bubble { background: var(--sp-green); color: #fff; border-bottom-right-radius: 4px; }
+  .msg.assistant .bubble { background: #fff; border: 1px solid #d0d7de; border-bottom-left-radius: 4px; }
+  @media (prefers-color-scheme: dark) { .msg.assistant .bubble { background: #26282c; border-color: #3a3d42; } }
+  .bubble p { margin: 6px 0; }
+  .bubble p:first-child { margin-top: 0; }
+  .bubble p:last-child { margin-bottom: 0; }
+  .bubble h1, .bubble h2, .bubble h3, .bubble h4 { margin: 12px 0 6px; font-size: 15px; line-height: 1.4; }
+  .bubble ul, .bubble ol { margin: 6px 0; padding-left: 22px; }
+  .bubble code { background: rgba(127,127,127,.14); border-radius: 4px; padding: 1px 5px; font-size: 13px; font-family: ui-monospace, monospace; }
+  .bubble pre { background: rgba(127,127,127,.1); border-radius: 8px; padding: 10px 12px; overflow-x: auto; margin: 8px 0; }
+  .bubble pre code { background: none; padding: 0; }
+  .bubble blockquote { margin: 6px 0; padding: 2px 12px; border-left: 3px solid rgba(127,127,127,.3); opacity: .85; }
+  .bubble a { color: var(--sp-green); }
+  .bubble table { border-collapse: collapse; margin: 8px 0; }
+  .bubble th, .bubble td { border: 1px solid rgba(127,127,127,.25); padding: 4px 10px; font-size: 13px; }
+  .bubble img { max-width: 100%; border-radius: 8px; }
+  .bubble hr { border: 0; border-top: 1px solid rgba(127,127,127,.2); margin: 10px 0; }
+  .typing { display: inline-flex; align-items: center; gap: 4px; padding: 4px 2px; }
+  .typing i { width: 6px; height: 6px; border-radius: 50%; background: rgba(127,127,127,.5); animation: blink 1.2s infinite; }
+  .typing i:nth-child(2) { animation-delay: .2s; }
+  .typing i:nth-child(3) { animation-delay: .4s; }
+  @keyframes blink { 0%, 80%, 100% { opacity: .3 } 40% { opacity: 1 } }
+  .err { color: #cf222e; white-space: pre-wrap; font-size: 13px; }
+  .msg .err { padding: 0 4px; }
+  /* 输入区 */
+  .chatInput { border-top: 1px solid rgba(127,127,127,.18); padding: 10px 16px calc(12px + env(safe-area-inset-bottom)); background: rgba(127,127,127,.04); }
+  .chatInput .keyRow { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
+  .chatInput .keyRow label { font-size: 12px; opacity: .7; white-space: nowrap; }
+  .chatInput .keyRow input { flex: 1; border: 1px solid rgba(127,127,127,.25); border-radius: 8px; background: transparent; color: inherit; padding: 6px 10px; font-size: 13px; }
+  .inputRow { display: flex; align-items: flex-end; gap: 8px; }
+  .inputRow textarea { flex: 1; border: 1px solid rgba(127,127,127,.25); border-radius: 12px; background: #fff; color: inherit; padding: 10px 12px; font-size: 14px; resize: none; min-height: 44px; max-height: 140px; line-height: 1.5; }
+  @media (prefers-color-scheme: dark) { .inputRow textarea { background: #26282c; border-color: #3a3d42; } }
+  .inputRow textarea:focus { outline: none; border-color: var(--sp-green); }
+  .inputRow .sendBtn { border: 0; border-radius: 12px; background: var(--sp-green); color: #fff; padding: 10px 18px; font-size: 14px; font-weight: 600; cursor: pointer; white-space: nowrap; }
+  .inputRow .sendBtn:disabled { opacity: .5; cursor: wait; }
+  .inputRow .sendBtn:hover:not(:disabled) { background: var(--sp-green-dim); }
+  .hint { text-align: center; font-size: 12px; opacity: .55; padding: 20px 0; }
 `;
 /** 容器列表页（v1.26.2）：只列已开放容器，点击进入 /c/<name> */
 function publicAskListPage(cccs) {
@@ -12286,7 +12327,7 @@ function publicAskListPage(cccs) {
 </body>
 </html>`;
 }
-/** 单容器问答页（v1.26.2）：URL 锁定容器，key + 角色；key 自动存 localStorage */
+/** 单容器问答页（v1.26.2→v1.26.4）：URL 锁定容器；聊天 UI——消息流 + 连续对话 + key 自动记忆 */
 function publicAskContainerPage(ccc) {
 	const data = JSON.stringify({
 		name: ccc.name,
@@ -12298,23 +12339,32 @@ function publicAskContainerPage(ccc) {
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Serenity Public Ask · ${ccc.name}</title>
+<title>Serenity · ${ccc.name}</title>
 <style>${ASK_CSS}</style>
 </head>
 <body>
-<main>
-  <a class="back" href="/">← 容器列表</a>
-  <h1>Serenity Public Ask</h1>
-  <div class="sub">认知容器：<span class="ccname">${ccc.name}</span></div>
-  <label for="key">访问 Key</label>
-  <input id="key" type="password" placeholder="请输入访问 key" autocomplete="off">
-  <label for="role">问答角色</label>
-  <select id="role"></select>
-  <label for="q">问题</label>
-  <textarea id="q" placeholder="向该认知容器提问…"></textarea>
-  <button id="ask">提问</button>
-  <div id="answer" class="muted">等待提问…</div>
-</main>
+<div class="chat">
+  <div class="chatHead">
+    <a class="back" href="/">← 容器</a>
+    <span class="title">Serenity · <span class="ccname">${ccc.name}</span></span>
+    <span class="spacer"></span>
+    <select id="role" title="问答角色"></select>
+    <button id="newChat" class="newBtn" title="清空当前对话（不存储，刷新即失）">新对话</button>
+  </div>
+
+  <div id="msgs" class="msgList"></div>
+
+  <div class="chatInput">
+    <div class="keyRow" id="keyRow">
+      <label for="key">访问 Key</label>
+      <input id="key" type="password" placeholder="请输入访问 key（自动记忆）" autocomplete="off">
+    </div>
+    <div class="inputRow">
+      <textarea id="q" placeholder="向 ${ccc.name} 提问…（Enter 发送，Shift+Enter 换行）" rows="1"></textarea>
+      <button id="ask" class="sendBtn">发送</button>
+    </div>
+  </div>
+</div>
 <script id="ask-data" type="application/json">${data}<\/script>
 <script>
 const CCC = JSON.parse(document.getElementById('ask-data').textContent)
@@ -12322,37 +12372,109 @@ const KEY_STORE = 'serenity-public-ask-key'
 const keyInput = document.getElementById('key')
 const roleSel = document.getElementById('role')
 const btn = document.getElementById('ask')
-const answer = document.getElementById('answer')
+const msgs = document.getElementById('msgs')
+const qInput = document.getElementById('q')
+const keyRow = document.getElementById('keyRow')
 let sessionId = ''
-// 角色下拉（v1.26.2 用户：3100 应能选择角色）
+let busy = false
+
+// 角色下拉
 roleSel.innerHTML = (CCC.roles || []).map((r) => '<option value="' + r + '">' + r + '</option>').join('') || '<option value="">(无角色)</option>'
-// key 自动从 localStorage 恢复（v1.26.2：输入一次后浏览器记住，无需每次粘贴）
-try { const saved = localStorage.getItem(KEY_STORE); if (saved) keyInput.value = saved } catch {}
-btn.addEventListener('click', async () => {
-  const q = document.getElementById('q').value.trim()
+// key 自动从 localStorage 恢复
+try { const saved = localStorage.getItem(KEY_STORE); if (saved) { keyInput.value = saved; keyRow.style.display = 'none' } } catch {}
+
+/** 追加一条消息气泡（role: user|assistant） */
+function addMsg(role, htmlOrText, isHtml) {
+  const m = document.createElement('div')
+  m.className = 'msg ' + role
+  const who = document.createElement('div')
+  who.className = 'who'
+  who.textContent = role === 'user' ? '你' : CCC.name
+  const bubble = document.createElement('div')
+  bubble.className = 'bubble'
+  if (isHtml) bubble.innerHTML = htmlOrText
+  else bubble.textContent = htmlOrText
+  m.appendChild(who)
+  m.appendChild(bubble)
+  msgs.appendChild(m)
+  msgs.scrollTop = msgs.scrollHeight
+  return bubble
+}
+
+/** 打字指示器（等待回答时显示） */
+function addTyping() {
+  const m = document.createElement('div')
+  m.className = 'msg assistant'
+  const who = document.createElement('div')
+  who.className = 'who'
+  who.textContent = CCC.name
+  const bubble = document.createElement('div')
+  bubble.className = 'bubble'
+  bubble.innerHTML = '<span class="typing"><i></i><i></i><i></i></span>'
+  m.appendChild(who)
+  m.appendChild(bubble)
+  msgs.appendChild(m)
+  msgs.scrollTop = msgs.scrollHeight
+  return bubble
+}
+
+async function ask() {
+  const q = qInput.value.trim()
   const key = keyInput.value.trim()
   const role = roleSel.value || undefined
-  if (!q) { answer.className = 'err'; answer.textContent = '请输入问题'; return }
-  if (!key) { answer.className = 'err'; answer.textContent = '请输入访问 key（没有 key 无法使用）'; return }
-  // 输入即记住（保存到 localStorage；下次自动填充）
-  try { localStorage.setItem(KEY_STORE, key) } catch {}
+  if (!q) return
+  if (!key) { keyInput.focus(); return }
+  if (busy) return
+  // 保存 key（下次自动记忆 + 隐藏 key 行）
+  try { localStorage.setItem(KEY_STORE, key); keyRow.style.display = 'none' } catch {}
+  // 追加用户消息 + 打字指示
+  addMsg('user', q, false)
+  qInput.value = ''
+  autoGrow()
+  const typing = addTyping()
+  busy = true
   btn.disabled = true
-  answer.className = 'muted'
-  answer.textContent = '运行中…'
   try {
     const res = await fetch('/c/' + encodeURIComponent(CCC.name) + '/ask', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ key, role, question: q, sessionId: sessionId || undefined }) })
     const data = await res.json()
-    if (!res.ok) { sessionId = ''; throw new Error(data.error || ('HTTP ' + res.status)) }
-    answer.className = ''
-    answer.innerHTML = data.answer_html || data.answer || '（空回答）'
+    typing.remove() // 移除打字指示，替换为真实回答
+    if (!res.ok) {
+      sessionId = ''
+      addMsg('assistant', '⚠️ ' + (data.error || ('HTTP ' + res.status)), true)
+      return
+    }
+    addMsg('assistant', data.answer_html || data.answer || '（空回答）', true)
     sessionId = data.sessionId || ''
   } catch (err) {
-    answer.className = 'err'
-    answer.textContent = String(err.message || err)
+    typing.remove()
+    addMsg('assistant', '⚠️ ' + String(err.message || err), true)
   } finally {
+    busy = false
     btn.disabled = false
+    qInput.focus()
   }
+}
+
+function autoGrow() {
+  qInput.style.height = 'auto'
+  qInput.style.height = Math.min(qInput.scrollHeight, 140) + 'px'
+}
+
+btn.addEventListener('click', () => void ask())
+qInput.addEventListener('keydown', (e) => {
+  if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); void ask() }
 })
+qInput.addEventListener('input', autoGrow)
+// 新对话：重置 sessionId + 清空消息流（前端内存，不存储——刷新即失）
+document.getElementById('newChat').addEventListener('click', () => {
+  sessionId = ''
+  msgs.innerHTML = ''
+  qInput.focus()
+})
+
+// 初始欢迎消息（外层模板求值注入容器名；textContent 渲染防注入）
+addMsg('assistant', '你好，我是「${ccc.name}」的认知助手。有什么可以帮你的？（本对话仅当前页面有效，刷新即失）', false)
+qInput.focus()
 <\/script>
 </body>
 </html>`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.26.3",
+  "version": "1.26.4",
   "description": "宁静号 ACC harness — Native Cordis 插件（DeepSeek Harness 运行时）。真实 DSH 工具注册（cc_fs/session/acc_msm 等 9 工具）+ 拦截缝机械约束（safe-mode/路径守卫/会话落盘）+ 系统提示词注入（ACC/CCE/Constraints/SKILL/Session 五块）。适配 DSH 公开版（deepseek-ai/deepseek-harness 0.1.0-rc）。",
   "license": "MIT",
   "repository": {