botmux 3.13.0 → 3.15.0

package/dist/core/dashboard-ipc-server.js

@@ -7,11 +7,14 @@ import { logger } from '../utils/logger.js';
 import { cliAuthBind, verifyHmac } from '../dashboard/auth.js';
 import { WORKFLOW_DAEMON_IPC_ROUTE_PREFIX } from '../workflows/v3/daemon-ipc-auth.js';
 import { V3_SESSION_RUN_MUTATION_ROUTE_PREFIX } from '../workflows/v3/session-relay.js';
+import { REPORT_SESSION_RELAY_ROUTE } from './report-session-relay.js';
+import { DISPATCH_REPORT_REGISTER_ROUTE } from './dispatch-report-binding.js';
 import { listenWithProbe } from '../utils/listen-with-probe.js';
 import { dashboardSecretPath } from './dashboard-secret.js';
 import { MANAGED_ORIGIN_ATTEST_ROUTE, MANAGED_ORIGIN_PROOF_DOMAIN, MANAGED_ORIGIN_PROOF_TTL_MS, writeManagedOriginAttestationProof, } from './managed-origin-attestation.js';
 import * as sessionStore from '../services/session-store.js';
 import { cliSupportsNativeUsage } from '../services/transcript-resolver.js';
+import { codexModelSupportsReasoningEffort, isCodexReasoningCliId, isCodexReasoningEffort, } from '../services/codex-reasoning-effort.js';
 import * as asyncTriggerStore from '../services/async-trigger-store.js';
 import { resolveAsyncTriggerState, decideAsyncOwnership } from '../services/async-trigger-state.js';
 import * as scheduleStore from '../services/schedule-store.js';
@@ -26,6 +29,7 @@ import { ensureBackendAvailable } from '../services/backend-availability.js';
 import * as persistentBackend from './persistent-backend.js';
 import * as cardPrefsStore from '../services/card-prefs-store.js';
 import * as substituteModeStore from '../services/substitute-mode-store.js';
+import { claimPromptContext } from '../services/prompt-context-store.js';
 import { createCliAdapterSync } from '../adapters/cli/registry.js';
 import { normalizeCliRuntimeConfig } from '../adapters/cli/runtime.js';
 import { evaluateReadIsolationGate } from '../adapters/cli/read-isolation.js';
@@ -61,7 +65,8 @@ import { getDeploymentIdentity } from '../services/deployment-identity.js';
 import { getBotUnionId } from '../services/bot-union-ids-store.js';
 import * as grantPrefsStore from '../services/grant-prefs-store.js';
 import { applyExactChatGrantRequest } from '../services/exact-chat-grant.js';
-import { findConfigField, applyConfigField, coerceConfigValue } from '../services/bot-config-store.js';
+import { findConfigField, applyConfigField, coerceConfigValue, setChatFeedbackPolicy } from '../services/bot-config-store.js';
+import { traceFeedbackPolicyForDelivery } from '../services/feedback-policy-resolver.js';
 import { globalBuiltinSkillInjectionDefault, resolveSkillInjectionSupport } from '../skills/injection-mode.js';
 import { summaryRangeFromBotConfig, updateDashboardSummaryRange } from '../services/summary-range-store.js';
 import { config } from '../config.js';
@@ -123,7 +128,9 @@ export function setSupervisorShutdownHandler(registration) {
     supervisorShutdownRegistration = registration;
 }
 import { composeRowFromActive, composeRowFromClosed, composeRowFromPersistedActive, feishuChatLink, setBotName as setRowsBotName, getBotName, } from './dashboard-rows.js';
-import { getBotBrand, getBot, getBotOpenId, loadBotConfigs, readBotSkillPolicy, getBotTuiSlashAllow } from '../bot-registry.js';
+import { getBotBrand, getBot, getBotOpenId, loadBotConfigs, readBotSkillPolicy, getBotTuiSlashAllow, MAX_TURN_TIMEOUT_MS } from '../bot-registry.js';
+import { generateAuthUrl, tryHandleCallbackUrl, getFeedGroupAuthStatus, FEED_GROUP_OAUTH_SCOPES } from '../utils/user-token.js';
+import { normalizeBrand } from '../im/lark/lark-hosts.js';
 import { normalizeKanbanColumn, normalizeKanbanPosition, normalizeSessionTitle } from './session-board.js';
 import { validateSlashInjection } from './slash-inject.js';
 import { validateRoleLibraryPath } from './role-library.js';
@@ -136,6 +143,7 @@ import { sessionAnchorId, larkTransportEnabled } from './types.js';
 import { isRiffBackendSession } from './persistent-backend.js';
 import { attachSkillPolicy, detachSkillPolicy } from './skills/im-command.js';
 import { readSkillRegistry } from '../services/skill-registry-store.js';
+import { isSessionGroup } from '../services/session-groups-store.js';
 import { commitDeviceIsolationActivation, DEVICE_ISOLATION_COMMIT_PATH, DEVICE_ISOLATION_PREPARE_PATH, DEVICE_ISOLATION_RELEASE_PATH, logDeviceIsolationActivationError, prepareDeviceIsolationActivation, releaseDeviceIsolationActivation, } from './device-isolation-daemon.js';
 // Daemon process start (module load ≈ daemon boot). Used by the SSE snapshot
 // replay to bound the "recently closed" set to sessions that flipped
@@ -530,10 +538,22 @@ function routeHasNarrowUntrustedAuth(method, pathname) {
     // 证明「我是这个会话当前这一轮的 CLI」，选不了别的会话。
     if (method === 'POST' && /^\/api\/sessions\/[^/]+\/(?:slash|cd|close|chat-rename)$/.test(pathname))
         return true;
+    // UserPromptSubmit hook 的 envelope claim：沙箱内 hook 读不到 host secret，
+    // 走 body 里的 per-turn capability；handler 内 sessionCliIpcAuth 绑定到 URL 的
+    // sessionId + 按 managedTurnOrigin.turnId 权威取（同 /close 姿势）。
+    if (method === 'POST' && /^\/api\/sessions\/[^/]+\/prompt-ctx\/claim$/.test(pathname))
+        return true;
     if (method === 'POST' && pathname === '/api/hooks/emit')
         return true;
     if (method === 'POST' && pathname === '/api/attention')
         return true;
+    // A sandboxed report cannot read the host HMAC secret. This narrow route
+    // validates the current session's rotating capability, binds the dispatch
+    // root server-side, then lets the trusted daemon relay to the orchestrator.
+    if (method === 'POST' && pathname === REPORT_SESSION_RELAY_ROUTE)
+        return true;
+    if (method === 'POST' && pathname === DISPATCH_REPORT_REGISTER_ROUTE)
+        return true;
     // macOS read-isolated `botmux send` presents a rotating worker capability;
     // the handler writes the authoritative tuple into a host-owned read-only
     // proof sidecar, so loopback response spoofing cannot confer authority.
@@ -889,6 +909,44 @@ ipcRoute('POST', '/api/sessions/:sessionId/close', async (req, res, params) => {
         jsonRes(res, r.ok ? 200 : 502, r);
     });
 });
+/**
+ * Host-side atomic claim/pop for the UserPromptSubmit hook（#794 方向 B）。
+ *
+ * 沙箱内的 `botmux user-prompt-hook` 不能在 read-only 的 `prompt-ctx/<sid>` 里
+ * unlink（HIGH-2），同正文多轮也不能靠 FIFO 猜（HIGH-1：某轮漏 claim 会串轮到
+ * 后续轮）。hook 把 (session 凭据 + fingerprint) 提交到这里，宿主按
+ * **managedTurnOrigin.turnId 权威 turn 绑定**精确取该轮的 envelope，先删再返回。
+ * 漏 claim 只孤儿化自己那条，不污染后续轮；上一轮的 stale sidecar 永远不会被返回。
+ *
+ * 鉴权与 /close、/slash 同构：trusted-host HMAC，或本会话 rotating per-turn
+ * capability（沙箱内读 host secret 失败时的回退）。任何未命中/失败 → 404/403，
+ * hook 端空输出 exit 0（fail-open：reminder 丢失 < 卡住 prompt）。
+ */
+ipcRoute('POST', '/api/sessions/:sessionId/prompt-ctx/claim', async (req, res, params) => {
+    const body = await readJsonBody(req).catch(() => ({}));
+    const ds = findActiveBySessionId(params.sessionId);
+    // claim 只读 daemon 自有本轮非凭证上下文（reminder/whiteboard），receiver 会话
+    // 也允许（allowReceiver: true）；close/slash/cd 等 managed action 仍默认拒绝。
+    const auth = sessionCliIpcAuth(req, ds, params.sessionId, body, { allowReceiver: true });
+    if (!auth.ok)
+        return jsonRes(res, 403, { ok: false, error: auth.error });
+    const fingerprint = typeof body?.fingerprint === 'string' ? body.fingerprint : '';
+    if (!/^[a-f0-9]{64}$/.test(fingerprint)) {
+        return jsonRes(res, 400, { ok: false, error: 'invalid_fingerprint' });
+    }
+    // 权威 turnId：daemon 当前这轮的 turnId（worker 发布的 managed_turn_origin）。
+    // hook 不需要、也不应自己提供 turnId——daemon 只认自己的权威值，避免 FIFO 串轮。
+    const turnId = ds?.managedTurnOrigin?.turnId;
+    if (!turnId)
+        return jsonRes(res, 404, { ok: false, error: 'no_active_turn' });
+    const prefix = typeof body?.prefix === 'string' && body.prefix.length > 0
+        ? body.prefix.slice(0, 64)
+        : undefined;
+    const envelope = claimPromptContext(params.sessionId, turnId, fingerprint, prefix);
+    if (!envelope)
+        return jsonRes(res, 404, { ok: false, error: 'not_found' });
+    jsonRes(res, 200, { ok: true, envelope });
+});
 // `botmux list` zombie pruning is maintenance, not explicit abandon. Serialize
 // against inbound admission and refuse if any backend-neutral durable owner
 // became unsettled after the CLI took its liveness snapshot.
@@ -1023,6 +1081,25 @@ ipcRoute('POST', '/api/sessions/:sessionId/suspend', async (_req, res, params) =
             // already reached, so report idempotent success without a live kill.
             return jsonRes(res, 200, { ok: true, sessionId: params.sessionId, suspended: false, reason: 'no_live_worker' });
         }
+        // Producing a reply — killing the worker now would drop this turn. Queue
+        // instead; worker-pool's runPendingSuspendIfSettled cashes it in on the
+        // idle/limited edge. Ordering matters: the idempotent no-worker branch above
+        // must win, so "worker was already gone" never reports as deferred.
+        //
+        // The suspendability check is part of the queueing condition, not a new guard
+        // ahead of it: a non-suspendable (pty) backend must keep falling through to
+        // suspendWorker's existing 409 rather than get a `deferred` that could only
+        // fail silently at fulfillment time.
+        if ((ds.lastScreenStatus === 'working' || ds.lastScreenStatus === 'analyzing')
+            && isSuspendableBackendType(ds.initConfig?.backendType)) {
+            ds.pendingSuspendReason = 'manual_suspend';
+            // Bind the claim to the generation that is producing right now: it must not
+            // outlive that worker (see clearPendingSuspendClaim).
+            ds.pendingSuspendGeneration = ds.workerGeneration;
+            return jsonRes(res, 200, {
+                ok: true, sessionId: params.sessionId, suspended: false, reason: 'deferred',
+            });
+        }
         if (!suspendWorker(ds, 'manual_suspend')) {
             // Live worker but a non-suspendable (pty) backend: killing it would drop the
             // in-memory conversation with no persistent pane to resume from lazily.
@@ -1125,7 +1202,7 @@ ipcRoute('POST', '/api/host-overload/sweep', async (req, res) => {
  *  capability 只证明「我是这个会话当前这一轮的 CLI」——绑定 URL sessionId，
  *  拿到别的 sessionId 也伪造不了它的 capability。会话不存在时对未签名调用方
  *  同样回 origin_unproven，不提供「哪些 sessionId 活跃」的探针。 */
-function sessionCliIpcAuth(req, ds, sessionId, body) {
+function sessionCliIpcAuth(req, ds, sessionId, body, opts = {}) {
     const claimedAttempt = typeof body?.originDispatchAttempt === 'number'
         && Number.isSafeInteger(body.originDispatchAttempt)
         && body.originDispatchAttempt > 0
@@ -1135,7 +1212,9 @@ function sessionCliIpcAuth(req, ds, sessionId, body) {
         trustedHost: isTrustedHostIpcRequest(req),
         sessionExists: !!ds,
         receiverSession: !!ds?.session.vcMeetingReceiver,
-        allowReceiver: false,
+        // close/slash/cd 是 managed action，默认拒绝 receiver；claim 只读 daemon 自有
+        // 本轮非凭证上下文（reminder/whiteboard），读自己本轮 reminder 非提权，单独放开。
+        allowReceiver: opts.allowReceiver === true,
         sessionId,
         liveOrigin: ds?.managedTurnOrigin,
         claimedCapability: typeof body?.originCapability === 'string' ? body.originCapability : undefined,
@@ -2679,7 +2758,17 @@ ipcRoute('GET', '/api/groups', async (_req, res) => {
             const observedBotNames = observedBotsStore
                 .listObservedBots(config.session.dataDir, cachedLarkAppId, c.chatId)
                 .map(b => b.name);
-            return { ...c, oncallChat: oncall ?? null, firstSeenAt: seenMap.get(c.chatId) ?? null, hasRole, hasMessageListener, observedBotNames };
+            return {
+                ...c,
+                oncallChat: oncall ?? null,
+                firstSeenAt: seenMap.get(c.chatId) ?? null,
+                hasRole,
+                hasMessageListener,
+                observedBotNames,
+                // 会话群分型（p2pMode=group 自动创建）：dashboard 群面板据此把它们
+                // 收进独立折叠区，避免淹没需要人工管理的常驻群。
+                ...(isSessionGroup(c.chatId) ? { sessionGroup: true } : {}),
+            };
         });
         jsonRes(res, 200, { chats: enriched });
     }
@@ -3369,10 +3458,17 @@ ipcRoute('GET', '/api/bot-default-oncall', async (_req, res) => {
     const grantPrefs = grantPrefsStore.getBotGrantPrefs(cachedLarkAppId);
     let p2pMode = 'chat';
     try {
-        if (getBot(cachedLarkAppId).config.p2pMode === 'thread')
-            p2pMode = 'thread';
+        const configured = getBot(cachedLarkAppId).config.p2pMode;
+        if (configured === 'thread' || configured === 'group')
+            p2pMode = configured;
     }
     catch { /* default chat */ }
+    let envelopeInjection = 'off';
+    try {
+        if (getBot(cachedLarkAppId).config.envelopeInjection === 'auto')
+            envelopeInjection = 'auto';
+    }
+    catch { /* default off */ }
     let skillInjection = null;
     // How this bot's CLI delivers botmux skills, so the dashboard can render the
     // control correctly: 'dynamic' = per-session --plugin-dir (claude-family, not
@@ -3392,6 +3488,10 @@ ipcRoute('GET', '/api/bot-default-oncall', async (_req, res) => {
     let cliPathOverride = null;
     let wrapperCli = null;
     let model = null;
+    let reasoningEffort = null;
+    // dsh runner turn timeout (ms). Only meaningful for the dsh adapter; exposed
+    // so the dashboard can render the dsh-only field with its current value.
+    let turnTimeoutMs = null;
     let agentSelectionKey = '';
     try {
         const cfg = getBot(cachedLarkAppId).config;
@@ -3406,6 +3506,11 @@ ipcRoute('GET', '/api/bot-default-oncall', async (_req, res) => {
             : null;
         wrapperCli = typeof cfg.wrapperCli === 'string' && cfg.wrapperCli.trim() ? cfg.wrapperCli : null;
         model = typeof cfg.model === 'string' && cfg.model.trim() ? cfg.model : null;
+        reasoningEffort = cfg.reasoningEffort ?? null;
+        turnTimeoutMs = typeof cfg.turnTimeoutMs === 'number'
+            && Number.isInteger(cfg.turnTimeoutMs) && cfg.turnTimeoutMs > 0
+            ? cfg.turnTimeoutMs
+            : null;
         agentSelectionKey = selectionKeyForBot(cliId, wrapperCli ?? undefined);
     }
     catch { /* no registered bot */ }
@@ -3493,6 +3598,8 @@ ipcRoute('GET', '/api/bot-default-oncall', async (_req, res) => {
         cliPathOverride,
         wrapperCli,
         model,
+        reasoningEffort,
+        turnTimeoutMs,
         agentSelectionKey,
         defaultOncall: defaultOncall ?? { enabled: false, workingDir: '', since: 0 },
         defaultWorkingDir,
@@ -3524,12 +3631,20 @@ ipcRoute('GET', '/api/bot-default-oncall', async (_req, res) => {
         regularGroupReplyMode: cardPrefs.regularGroupReplyMode,
         regularGroupMentionMode: cardPrefs.regularGroupMentionMode,
         substituteMode: substituteModeStore.getBotSubstituteMode(cachedLarkAppId) ?? null,
+        feedback: (() => { try {
+            return getBot(cachedLarkAppId).config.feedback ?? null;
+        }
+        catch {
+            return null;
+        } })(),
         docSubscribeDefaultMode: cardPrefs.docSubscribeDefaultMode,
         restrictGrantCommands: grantPrefs.restrictGrantCommands,
         autoGrantRequestCards: grantPrefs.autoGrantRequestCards,
+        p2pOpen: grantPrefs.p2pOpen,
         messageQuotaDefaultLimit: grantPrefs.messageQuotaDefaultLimit,
         grantDefaultDurationMs: grantPrefs.grantDefaultDurationMs,
         p2pMode,
+        envelopeInjection,
         skillInjection,
         skillInjectionSupport,
         // Resolved machine-wide default → the dashboard shows it as the pre-selected
@@ -3698,6 +3813,7 @@ ipcRoute('PUT', '/api/bot-summary-trigger', async (req, res) => {
 // Per-bot 授权偏好。Body 任意子集：
 //   • restrictGrantCommands: boolean       — 限制被授权人只能纯对话
 //   • autoGrantRequestCards: boolean       — 未授权 @ 被挡住时是否发 grant 申请卡
+//   • p2pOpen: boolean                     — 私聊对话全开（talk-only；管理权仍只认 allowedUsers）
 //   • messageQuotaDefaultLimit: number|null — 卡片/Oncall 额度覆盖（null = 卡片内置 3 条、Oncall 不限）
 //   • grantDefaultDurationMs: number|null   — 新授权默认有限时长（null = 产品默认 1 小时）
 ipcRoute('PUT', '/api/bot-grant-prefs', async (req, res) => {
@@ -3720,6 +3836,8 @@ ipcRoute('PUT', '/api/bot-grant-prefs', async (req, res) => {
         patch.restrictGrantCommands = body.restrictGrantCommands;
     if (typeof body.autoGrantRequestCards === 'boolean')
         patch.autoGrantRequestCards = body.autoGrantRequestCards;
+    if (typeof body.p2pOpen === 'boolean')
+        patch.p2pOpen = body.p2pOpen;
     // null（含 JSON null）= 恢复内置额度策略；number = 设定覆盖值（store 内校验 1–1000）。
     if (body.messageQuotaDefaultLimit === null)
         patch.messageQuotaDefaultLimit = null;
@@ -3876,7 +3994,29 @@ ipcRoute('PUT', '/api/bot-agent', async (req, res) => {
         return jsonRes(res, 400, { ok: false, error: 'invalid_cli', message: err?.message ?? String(err) });
     }
     const model = typeof body.model === 'string' ? body.model.trim() : '';
+    const reasoningEffortFieldPresent = Object.prototype.hasOwnProperty.call(body, 'reasoningEffort');
+    const reasoningEffort = isCodexReasoningEffort(body.reasoningEffort) ? body.reasoningEffort : null;
+    if (body.reasoningEffort !== undefined && body.reasoningEffort !== '' && reasoningEffort === null) {
+        return jsonRes(res, 400, { ok: false, error: 'invalid_reasoning_effort' });
+    }
     const currentBotConfig = getBot(larkAppId).config;
+    const supportsReasoningEffort = isCodexReasoningCliId(selected.cliId);
+    // Per-bot dsh runner turn timeout. Only the dsh adapter forwards it
+    // (`--turn-timeout-ms`); the dashboard exposes the field for dsh only. The
+    // field is optional in the body, so distinguish absent (preserve) from
+    // present-but-empty (clear → runner default) like reasoningEffort does.
+    const supportsTurnTimeout = selected.cliId === 'dsh';
+    const turnTimeoutFieldPresent = Object.prototype.hasOwnProperty.call(body, 'turnTimeoutMs');
+    let nextTurnTimeoutMs;
+    if (turnTimeoutFieldPresent && body.turnTimeoutMs !== null && body.turnTimeoutMs !== '') {
+        const n = Number(body.turnTimeoutMs);
+        // Positive integer within the arm-able bound; reject anything else so an
+        // over-bound value can't wrap to ~1ms in the runner's setTimeout.
+        if (!Number.isInteger(n) || n <= 0 || n > MAX_TURN_TIMEOUT_MS) {
+            return jsonRes(res, 400, { ok: false, error: 'invalid_turn_timeout_ms' });
+        }
+        nextTurnTimeoutMs = n;
+    }
     const runtimeFieldPresent = Object.prototype.hasOwnProperty.call(body, 'cliRuntime');
     const currentSelectionKey = selectionKeyForBot(currentBotConfig.cliId, currentBotConfig.wrapperCli);
     const selectionChanged = key !== currentSelectionKey;
@@ -3971,6 +4111,12 @@ ipcRoute('PUT', '/api/bot-agent', async (req, res) => {
         // is the other way a bot could end up configured-but-unenforceable.)
         let readIsolationCleared = false;
         const r = await rmwBotEntry(larkAppId, (entry) => {
+            const nextReasoningEffort = supportsReasoningEffort
+                ? (reasoningEffortFieldPresent ? reasoningEffort ?? undefined : entry.reasoningEffort)
+                : undefined;
+            if (nextReasoningEffort && !codexModelSupportsReasoningEffort(model || undefined, nextReasoningEffort)) {
+                return { write: false, result: { error: 'reasoning_effort_not_supported_by_model' } };
+            }
             entry.cliId = selected.cliId;
             if (selected.wrapperCli)
                 entry.wrapperCli = selected.wrapperCli;
@@ -3994,6 +4140,24 @@ ipcRoute('PUT', '/api/bot-agent', async (req, res) => {
                 entry.model = model;
             else
                 delete entry.model;
+            if (!supportsReasoningEffort)
+                delete entry.reasoningEffort;
+            else if (reasoningEffortFieldPresent) {
+                if (reasoningEffort)
+                    entry.reasoningEffort = reasoningEffort;
+                else
+                    delete entry.reasoningEffort;
+            }
+            // dsh-only turn timeout: non-dsh always drops it; on dsh, an explicit
+            // field value writes/clears it, absence preserves the current value.
+            if (!supportsTurnTimeout)
+                delete entry.turnTimeoutMs;
+            else if (turnTimeoutFieldPresent) {
+                if (nextTurnTimeoutMs !== undefined)
+                    entry.turnTimeoutMs = nextTurnTimeoutMs;
+                else
+                    delete entry.turnTimeoutMs;
+            }
             if (entry.readIsolation === true &&
                 !readIsolationEnforceableFor({ cliId: selected.cliId, cliPathOverride: effectivePath, wrapperCli: selected.wrapperCli })) {
                 delete entry.readIsolation;
@@ -4009,10 +4173,17 @@ ipcRoute('PUT', '/api/bot-agent', async (req, res) => {
                 // 任务）。手动的 pty/tmux/herdr/zellij override 不受影响（它们不会是 riff）。
                 delete entry.backendType;
             }
-            return { write: true, result: null };
+            return { write: true, result: { nextReasoningEffort } };
         });
         if (!r.ok)
             return jsonRes(res, 400, { ok: false, error: r.reason });
+        if (r.result.error) {
+            return jsonRes(res, 400, {
+                ok: false,
+                error: r.result.error,
+                message: `模型 ${model || '（Codex 默认模型）'} 不支持当前思考强度`,
+            });
+        }
         const bot = getBot(larkAppId);
         bot.config.cliId = selected.cliId;
         bot.config.cliRuntime = nextRuntime;
@@ -4022,6 +4193,16 @@ ipcRoute('PUT', '/api/bot-agent', async (req, res) => {
         else
             bot.config.wrapperCli = undefined;
         bot.config.model = model || undefined;
+        if (!supportsReasoningEffort)
+            bot.config.reasoningEffort = undefined;
+        else
+            bot.config.reasoningEffort = r.result.nextReasoningEffort ?? undefined;
+        // Mirror the entry write: non-dsh clears it, dsh with an explicit field
+        // takes the parsed value, dsh without the field preserves the existing one.
+        if (!supportsTurnTimeout)
+            bot.config.turnTimeoutMs = undefined;
+        else if (turnTimeoutFieldPresent)
+            bot.config.turnTimeoutMs = nextTurnTimeoutMs;
         if (readIsolationCleared)
             bot.config.readIsolation = false;
         if (selected.cliId === 'riff') {
@@ -4041,6 +4222,8 @@ ipcRoute('PUT', '/api/bot-agent', async (req, res) => {
             cliPathOverride: nextRuntime ? null : nextLegacyPath ?? null,
             wrapperCli: selected.wrapperCli ?? null,
             model: model || null,
+            reasoningEffort: supportsReasoningEffort ? bot.config.reasoningEffort ?? null : null,
+            turnTimeoutMs: supportsTurnTimeout ? bot.config.turnTimeoutMs ?? null : null,
             selectionKey,
             closedMismatchedSessions,
             // Report the (possibly auto-cleared) read-isolation state + whether the new
@@ -4056,9 +4239,100 @@ ipcRoute('PUT', '/api/bot-agent', async (req, res) => {
         });
     });
 });
-// Per-bot 私聊单聊模式 p2pMode。Body `{ p2pMode: 'chat' | 'thread' }`:
+// ─── 会话群标签授权（feed-group OAuth，Dashboard 一站式流程）────────────────
+// POST /api/oauth-callback {url} — dashboard 的 /oauth/callback 接收页把回调
+// URL 广播给各 daemon；state 在本进程 pendingLogins 里的那个完成 code→token
+// 交换，其它 daemon 返回 matched:false 让 dashboard 继续尝试下一个。
+ipcRoute('POST', '/api/oauth-callback', async (req, res) => {
+    let body;
+    try {
+        body = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    if (typeof body.url !== 'string' || !body.url.trim()) {
+        return jsonRes(res, 400, { ok: false, error: 'url_required' });
+    }
+    const result = await tryHandleCallbackUrl(body.url.trim());
+    if (!result)
+        return jsonRes(res, 200, { ok: false, matched: false, message: 'not a callback url' });
+    jsonRes(res, 200, { ok: result.ok, matched: result.matched, message: result.message });
+});
+// POST /api/session-group-tag-auth — 生成带 feed-group scope 的授权链接。
+// state 存本 daemon 进程内存，回调必须经由上面的 /api/oauth-callback 回到
+// 同一进程完成，故链接生成与回调处理都放 IPC 侧。
+ipcRoute('POST', '/api/session-group-tag-auth', async (_req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { error: 'larkAppId_not_set' });
+    try {
+        const cfg = getBot(cachedLarkAppId).config;
+        const { authUrl } = generateAuthUrl(cfg.larkAppId, cfg.larkAppSecret, normalizeBrand(cfg.brand), FEED_GROUP_OAUTH_SCOPES);
+        jsonRes(res, 200, { ok: true, authUrl });
+    }
+    catch (e) {
+        jsonRes(res, 500, { ok: false, error: e?.message ?? String(e) });
+    }
+});
+// GET /api/session-group-tag-status — 标签授权状态（Dashboard 徽标）。
+ipcRoute('GET', '/api/session-group-tag-status', async (_req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { error: 'larkAppId_not_set' });
+    try {
+        const cfg = getBot(cachedLarkAppId).config;
+        const status = getFeedGroupAuthStatus(cfg.larkAppId, normalizeBrand(cfg.brand));
+        jsonRes(res, 200, { ok: true, ...status, tagMode: cfg.sessionGroup?.tag?.mode ?? 'feed-group' });
+    }
+    catch (e) {
+        jsonRes(res, 500, { ok: false, error: e?.message ?? String(e) });
+    }
+});
+// PUT /api/session-group-tag-config — 会话群标签模式（Dashboard tag mode
+// selector，PR review：授权行必须与实际 tagMode 一致）。Body `{ mode }`：
+// 'feed-group'（默认，个人侧边栏分组，需一次 OAuth，任何租户可用）|
+// 'chat-tag'（应用租户身份，无需用户授权，但部分租户权限目录无该 scope）|
+// 'off'。写 bots.json 的 sessionGroup.tag.mode 并热更内存注册表，与
+// /botconfig 同一持久化通道。
+ipcRoute('PUT', '/api/session-group-tag-config', async (req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { error: 'larkAppId_not_set' });
+    let body;
+    try {
+        body = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    const mode = body.mode === 'chat-tag' || body.mode === 'feed-group' || body.mode === 'off'
+        ? body.mode : undefined;
+    if (!mode)
+        return jsonRes(res, 400, { ok: false, error: 'invalid_mode' });
+    try {
+        const bot = getBot(cachedLarkAppId);
+        const r = await rmwBotEntry(cachedLarkAppId, (entry) => {
+            if (!entry.sessionGroup || typeof entry.sessionGroup !== 'object')
+                entry.sessionGroup = {};
+            if (!entry.sessionGroup.tag || typeof entry.sessionGroup.tag !== 'object')
+                entry.sessionGroup.tag = {};
+            entry.sessionGroup.tag.mode = mode;
+            return { write: true, result: mode };
+        });
+        if (!r.ok)
+            return jsonRes(res, 400, { ok: false, error: r.reason });
+        bot.config.sessionGroup = {
+            ...(bot.config.sessionGroup ?? {}),
+            tag: { ...(bot.config.sessionGroup?.tag ?? {}), mode },
+        };
+        jsonRes(res, 200, { ok: true, tagMode: mode });
+    }
+    catch (e) {
+        jsonRes(res, 500, { ok: false, error: e?.message ?? String(e) });
+    }
+});
+// Per-bot 私聊单聊模式 p2pMode。Body `{ p2pMode: 'chat' | 'thread' | 'group' }`:
 //   • 'chat'（默认）    → 私聊走扁平连续 chat-scope 会话
 //   • 'thread'          → 显式回到每条 DM 独立 thread-scope 会话
+//   • 'group'           → 每条顶层 DM 自动建专属会话群并把会话落进去
 // 走 applyConfigField（与 /botconfig 同一写盘 + 热更新路径），保证一致。
 ipcRoute('PUT', '/api/bot-p2p-mode', async (req, res) => {
     if (!cachedLarkAppId)
@@ -4073,13 +4347,37 @@ ipcRoute('PUT', '/api/bot-p2p-mode', async (req, res) => {
     const spec = findConfigField('p2pMode');
     if (!spec)
         return jsonRes(res, 500, { ok: false, error: 'spec_missing' });
-    // 只有 'thread' 有意义；其它（含 'chat'，新默认)一律清回默认，bots.json 保持干净。
-    const value = body.p2pMode === 'thread' ? 'thread' : null;
+    // 只有 'thread' / 'group' 有意义；其它（含 'chat'，新默认)一律清回默认，bots.json 保持干净。
+    const value = body.p2pMode === 'thread' ? 'thread' : body.p2pMode === 'group' ? 'group' : null;
     const r = await applyConfigField(cachedLarkAppId, spec, value);
     if (!r.ok)
         return jsonRes(res, 400, { ok: false, error: r.reason });
     jsonRes(res, 200, { ok: true, p2pMode: value ?? 'chat' });
 });
+// Per-bot 每轮上下文注入方式 envelopeInjection（#794）。Body `{ envelopeInjection: 'auto'|'off'|'' }`:
+//   • 'auto' → 支持的 CLI（claude-code）把 reminder/whiteboard 经 UserPromptSubmit
+//     hook 注入为 system-reminder，user turn 只留消息本身；不支持的自动回退内联
+//   • 'off'/其它 → 内联 envelope（历史行为，默认）
+// 走 applyConfigField（与 /botconfig 同一写盘 + 热更新路径），下一个 follow-up turn 生效。
+ipcRoute('PUT', '/api/bot-envelope-injection', async (req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { error: 'larkAppId_not_set' });
+    let body;
+    try {
+        body = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    const spec = findConfigField('envelopeInjection');
+    if (!spec)
+        return jsonRes(res, 500, { ok: false, error: 'spec_missing' });
+    const value = body.envelopeInjection === 'auto' ? 'auto' : null;
+    const r = await applyConfigField(cachedLarkAppId, spec, value);
+    if (!r.ok)
+        return jsonRes(res, 400, { ok: false, error: r.reason });
+    jsonRes(res, 200, { ok: true, envelopeInjection: value ?? 'off' });
+});
 // Per-bot 内置技能注入模式 skillInjection。Body `{ skillInjection: 'global'|'prompt'|'off'|'' }`:
 //   • 'global'|'prompt'|'off' → 显式覆盖本 bot
 //   • ''/其它                  → 清回机器级默认（config.json skills.builtinInjection）
@@ -4236,6 +4534,56 @@ ipcRoute('PUT', '/api/bot-launch-shell', async (req, res) => {
         return jsonRes(res, 400, { ok: false, error: r.reason });
     jsonRes(res, 200, { ok: true, launchShell: value ?? '' });
 });
+ipcRoute('PUT', '/api/bot-feedback', async (req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { error: 'larkAppId_not_set' });
+    let body;
+    try {
+        body = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    const spec = findConfigField('feedback');
+    if (!spec)
+        return jsonRes(res, 500, { ok: false, error: 'spec_missing' });
+    const raw = typeof body.feedback === 'string' ? body.feedback : '';
+    let value = null;
+    if (raw.trim()) {
+        const coerced = coerceConfigValue(spec, raw);
+        if (!coerced.ok)
+            return jsonRes(res, 400, { ok: false, error: coerced.reason });
+        value = coerced.value;
+    }
+    const r = await applyConfigField(cachedLarkAppId, spec, value);
+    if (!r.ok)
+        return jsonRes(res, 400, { ok: false, error: r.reason });
+    jsonRes(res, 200, { ok: true, feedback: value });
+});
+ipcRoute('PUT', '/api/chat-feedback/:chatId', async (req, res, params) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { ok: false, error: 'larkAppId_not_set' });
+    let body;
+    try {
+        body = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+    }
+    const feedback = body.feedback === null || body.feedback === undefined ? null : body.feedback;
+    const result = await setChatFeedbackPolicy(cachedLarkAppId, decodeURIComponent(params.chatId), feedback);
+    if (!result.ok)
+        return jsonRes(res, result.reason === 'bot_not_registered' ? 404 : 400, { ok: false, error: result.reason });
+    jsonRes(res, 200, { ok: true, feedback });
+});
+ipcRoute('GET', '/api/feedback-effective', async (req, res) => {
+    if (!cachedLarkAppId)
+        return jsonRes(res, 503, { ok: false, error: 'larkAppId_not_set' });
+    const chatId = new URL(req.url ?? '/', 'http://localhost').searchParams.get('chatId') || undefined;
+    jsonRes(res, 200, { ok: true, trace: traceFeedbackPolicyForDelivery({
+            dataDir: config.session.dataDir, larkAppId: cachedLarkAppId, chatId, bot: getBot(cachedLarkAppId).config,
+        }) });
+});
 // Per-bot 环境变量 env。Body `{ env: string }`（原始 JSON 文本，如
 // `{"ANTHROPIC_BASE_URL":"…","ANTHROPIC_AUTH_TOKEN":"…"}` 让本 bot 走 GLM/第三方
 // 服务商）：空白 → 清除；否则按 json kind 解析 + sanitizePerBotEnv 过滤后落盘。