Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4746,18 +4746,37 @@ export function isAutoInjectedNotification(text: string): boolean {
return AUTO_INJECTED_NOTIFICATION_PREFIXES.some((p) => asciiCI(t.slice(0, p.length), p));
}

// Host-injected XML-wrapped context fragments (WorkBuddy/CodeBuddy, #4776):
// closed-source harnesses splice machine-generated wrappers into the
// conversation as USER-role messages ahead of the first real question —
// `<system-reminder data-role="compact-summary|user-context|memory">…`,
// `<user_query>…`, `<task-notification>…`, `<cb_summary>…`, `<memory>…`. The
// marker/prefix permitlists above are per-host and cannot keep up with
// closed-source harnesses, so this one is a STRUCTURAL rule instead: a
// tag-shaped opener identifies no human question on any host observed so far,
// while real user text essentially never opens with a tag. A literal paste
// that does (e.g. HTML being debugged) only DEFERS the title to the next
// message — self-healing — whereas adopting it locks a garbage title behind
// set-once semantics. That consequence asymmetry is what licenses deviating
// from the evidence-permitlist discipline used by the two checks above.
export function isTagShapedText(text: string): boolean {
const t = text.trim();
return /^<\/?[a-z_][\w:.-]*/i.test(t);
}

/** Derive a short human-readable title from the first real user text message.
* Used so the web UI can show "Fix auth bug" instead of an opaque hash.
* Contextual fragments (#2118) and host-injected notifications (#2286) are
* skipped — if no real question has arrived yet, no title is set and
* derivation retries on later requests. */
* Contextual fragments (#2118), host-injected notifications (#2286) and
* tag-shaped wrapper openers (#4776) are skipped — if no real question has
* arrived yet, no title is set and derivation retries on later requests. */
export function deriveTitle(messages: CoreMessage[]): string | undefined {
for (const m of messages) {
if (m.role !== "user" || m.contentType !== "text") continue;
const raw = m.text ?? "";
if (!raw.trim()) continue;
if (isContextualUserFragment(raw)) continue;
if (isAutoInjectedNotification(raw)) continue;
if (isTagShapedText(raw)) continue;
const clean = raw.replace(/\s+/g, " ").trim();
return clean.length > 60 ? clean.slice(0, 57) + "\u2026" : clean;
}
Expand Down
10 changes: 7 additions & 3 deletions src/server/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { dismissHostPlugin, visibleHostPluginNotices } from "../host-plugin-noti
import { dismissUpgradeNotice } from "../pck-notice.js";
import { mergedNotices, localDismissKey, localDismissMode, markInstanceDismissal } from "../announcements.js";
import { remoteAnnouncementPayloads, remoteDismissKey, remoteDismissMode } from "../remote-notices.js";
import { listSessions, memoryReport, peekSession, splitSessionWarnings, totalInFlight } from "../session.js";
import { anonymousIdentitySummary, listSessions, memoryReport, peekSession, splitSessionWarnings, totalInFlight } from "../session.js";
import { BILI_TUNNEL_HEADER } from "../tunnel-guard.js";
import { isLoopbackAddress } from "../util.js";
import { clearUpstreamAlertsForHost, getUpstreamAlerts, getUpstreamHealthReport } from "../upstream-alerts.js";
Expand Down Expand Up @@ -1310,14 +1310,18 @@ async function sendStatus(res: http.ServerResponse, opts: ProxyOptions, laneHost
// fs hiccup: report running state only, never fail the status endpoint
}
res.writeHead(200, { "content-type": "application/json" });
const splitWarnings = splitSessionWarnings(listSessions());
const statusSessions = listSessions();
const splitWarnings = splitSessionWarnings(statusSessions);
for (const w of splitWarnings) {
if (!splitWarnedBases.has(w.base)) {
splitWarnedBases.add(w.base);
loggerLog("warn", `split-session canary (#2170): conversation ${w.base} has live traffic under multiple session keys (design persona forks are excluded): ${w.sessions.map((s) => `${s.id} (requests=${s.requests})`).join("; ")}. For a non-persona host this is the #2165 failure shape (stolen anchor / never-compressing split) — investigate if unexpected.`);
}
}
res.end(JSON.stringify({ version: VERSION, commit: BUILD_COMMIT, origin: laneHost ?? null, diskVersion, stale, lastInstall, updateReady: updateReadyPayload(), autoRestartOnUpdate: opts.autoRestartOnUpdate, advisory: currentAdvisoryPayload(), resolverWedge: getResolverWedgeState(), updatePolicy: updatePolicyPayload(), pluginAdvisories: detectCostAdvisories(process.env), inFlight: totalInFlight(), splitSessions: splitWarnings, conflicts: summarizeConflicts(listSessions()), storage: storageStatusWire(), snapshotShadow: snapshotShadowStatusWire(), attribution: attributionStatusWire() }, null, 2));
// #4776: additive honest count for identity-less clients — splitSessions above
// is the #2165 shared-base canary and structurally blind to pfa-* forks.
const anonymousIdentity = anonymousIdentitySummary(statusSessions);
res.end(JSON.stringify({ version: VERSION, commit: BUILD_COMMIT, origin: laneHost ?? null, diskVersion, stale, lastInstall, updateReady: updateReadyPayload(), autoRestartOnUpdate: opts.autoRestartOnUpdate, advisory: currentAdvisoryPayload(), resolverWedge: getResolverWedgeState(), updatePolicy: updatePolicyPayload(), pluginAdvisories: detectCostAdvisories(process.env), inFlight: totalInFlight(), splitSessions: splitWarnings, anonymousIdentity, conflicts: summarizeConflicts(statusSessions), storage: storageStatusWire(), snapshotShadow: snapshotShadowStatusWire(), attribution: attributionStatusWire() }, null, 2));
}

// #2090 plan A — read-only view backing the web UI's "Signed upstreams" card:
Expand Down
19 changes: 13 additions & 6 deletions src/server/handle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1603,8 +1603,12 @@ async function handleRequest(
anonProvenance = buildAnonymousProvenance(req.headers, affinityMessageList(), req.socket?.remoteAddress);
const provSuffix = `; ua=${JSON.stringify(anonProvenance.ua ?? "-")} plugin=${anonProvenance.pluginAgent ?? "-"} first=${JSON.stringify(anonProvenance.firstMsg ?? "-")}`;
const lineage = anonAffinity.lineage ? `; lineage=${anonAffinity.lineage.reason} of ${anonAffinity.lineage.parents.join(",")}` : "";
log("info", `[prefix-affinity] new anonymous session ${anonAffinity.sessionId} (depth=${anonAffinity.incomingDepth}, tail=${anonAffinity.tailHash.slice(0, 8)}${lineage}${provSuffix})`);
loggerLog("info", `[prefix-affinity] new session ${anonAffinity.sessionId} at depth ${anonAffinity.incomingDepth} (tail=${anonAffinity.tailHash.slice(0, 8)}${lineage}${provSuffix})`);
// #4776: name the identity gap at the ONE observable moment — this
// client sent no stable conversation id, so the pfa-* id is
// content-affinity-derived and will split again on fork/resume.
const identityNote = "; no client-provided conversation id - content-affinity identity, unstable across forks";
log("info", `[prefix-affinity] new anonymous session ${anonAffinity.sessionId} (depth=${anonAffinity.incomingDepth}, tail=${anonAffinity.tailHash.slice(0, 8)}${lineage}${provSuffix}${identityNote})`);
loggerLog("info", `[prefix-affinity] new session ${anonAffinity.sessionId} at depth ${anonAffinity.incomingDepth} (tail=${anonAffinity.tailHash.slice(0, 8)}${lineage}${provSuffix}${identityNote})`);
// A verified anonymous history replay is evidence of possible
// identity loss, not proof that the identified client moved.
if (anonAffinity.orphanSuspect !== undefined && anonAffinity.orphanSuspect.length > 0) {
Expand Down Expand Up @@ -1768,14 +1772,17 @@ async function handleRequest(
if (anonAffinity) {
prefixAffinity.note(sessionId, anonAffinity.incomingDepth, anonAffinity.tailHash, anonAffinity.itemHashes, false, anonAffinity.sketches, anonAffinity.userFlags, undefined, anonAffinity.tailFragments);
scheduleAffinityPersist();
// The rest of this stamp is latest-wins; `producer` is NOT — the
// mint request's fingerprint must survive every later turn (#2879).
const existingProducer = (session.metadata.anonymousPrefixAffinity as { producer?: AnonymousProvenance } | undefined)?.producer;
// The rest of this stamp is latest-wins; `producer` and `lineage` are NOT —
// both exist only on the mint request (via==="new"), so latest-wins would
// erase them on the first continuation turn: the mint fingerprint (#2879)
// and the birth attribution that /__bili/status counts on (#4776).
const existingApa = session.metadata.anonymousPrefixAffinity as { producer?: AnonymousProvenance; lineage?: { parents: string[]; reason: "truncated" | "forked"; sharedPrefix?: number } } | undefined;
const existingProducer = existingApa?.producer;
session.metadata.anonymousPrefixAffinity = {
depth: anonAffinity.incomingDepth,
tailHash: anonAffinity.tailHash,
via: anonAffinity.via,
...(anonAffinity.lineage ? { lineage: anonAffinity.lineage } : {}),
...(anonAffinity.lineage ? { lineage: anonAffinity.lineage } : existingApa?.lineage ? { lineage: existingApa.lineage } : {}),
...(existingProducer ? { producer: existingProducer } : anonProvenance ? { producer: anonProvenance } : {}),
};
} else if (clientProvided && zcodeMemory === undefined) {
Expand Down
4 changes: 2 additions & 2 deletions src/server/prepare-anthropic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { captureThreadsTurn, estimateThreadsTokens, isThreadsBody, threadsReforg
import type { CompressReasoningConfig } from "../reasoning-drop.js";
import type { ProxyOptions } from "../config.js";
import { pluginAgentHeader } from "../plugin.js";
import { applyReasoningDrop, dedupeAdjacentOutputConfig, diagNudge, diagTagSummary, deriveTitle, effectiveTokenCount, imageBillingFor, imageReserveFor, imageTokenCapFor, isAutoInjectedNotification, planReasoningDrop, reapOrphansLogged, runNudgeDecision, stripKernelSummaries, warnAnthropicThinkingPairs, type Prepared } from "../server.js";
import { applyReasoningDrop, dedupeAdjacentOutputConfig, diagNudge, diagTagSummary, deriveTitle, effectiveTokenCount, imageBillingFor, imageReserveFor, imageTokenCapFor, isAutoInjectedNotification, isTagShapedText, planReasoningDrop, reapOrphansLogged, runNudgeDecision, stripKernelSummaries, warnAnthropicThinkingPairs, type Prepared } from "../server.js";
import { recordNudgeObservation } from "../context-analysis.js";
import { buildDecisionPrompt, buildDirectiveText, consumeFallback, ladderMode, resolveDecisionRange, stripDecisionReasoningFields, type DecideConfig } from "../nudge-decide.js";
import { excludeDeadRefRanges } from "../acp-status.js";
Expand Down Expand Up @@ -398,7 +398,7 @@ export async function prepareAnthropic(
nudge = turn.nudge;
session.stats.contextTokens = tokenCount;
session.stats.contextTokensSource = tokenCountSource;
if (!session.meta.title || isAutoInjectedNotification(session.meta.title)) {
if (!session.meta.title || isAutoInjectedNotification(session.meta.title) || isTagShapedText(session.meta.title)) {
const t = deriveTitle(msgs);
if (t) session.meta.title = t;
}
Expand Down
4 changes: 2 additions & 2 deletions src/server/prepare-google.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { coreToGoogle, googleToCore, normalizeGoogleUserPartOrder, type BiliMess
import type { ProxyOptions } from "../config.js";
import { pluginAgentHeader } from "../plugin.js";
import { currentCalibrationFactor } from "../util.js";
import { diagNudge, diagTagSummary, deriveTitle, effectiveTokenCount, imageBillingFor, imageReserveFor, imageTokenCapFor, isAutoInjectedNotification, reapOrphansLogged, resolveKnownOutputCeiling, runNudgeDecision, stripKernelSummaries, usageGradeInputBaseline, type Prepared } from "../server.js";
import { diagNudge, diagTagSummary, deriveTitle, effectiveTokenCount, imageBillingFor, imageReserveFor, imageTokenCapFor, isAutoInjectedNotification, isTagShapedText, reapOrphansLogged, resolveKnownOutputCeiling, runNudgeDecision, stripKernelSummaries, usageGradeInputBaseline, type Prepared } from "../server.js";
import { recordNudgeObservation } from "../context-analysis.js";
import { yieldToEventLoop } from "../yield-loop.js";
import { buildDecisionPrompt, buildDirectiveText, consumeFallback, ladderMode, resolveDecisionRange, stripDecisionReasoningFields, type DecideConfig } from "../nudge-decide.js";
Expand Down Expand Up @@ -234,7 +234,7 @@ export async function prepareGoogle(
nudge = turn.nudge;
session.stats.contextTokens = tokenCount;
session.stats.contextTokensSource = tokenCountSource;
if (!session.meta.title || isAutoInjectedNotification(session.meta.title)) {
if (!session.meta.title || isAutoInjectedNotification(session.meta.title) || isTagShapedText(session.meta.title)) {
const t = deriveTitle(msgs);
if (t) session.meta.title = t;
}
Expand Down
4 changes: 2 additions & 2 deletions src/server/prepare-openai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { currentCalibrationFactor, hardenOpenaiAssistantContent, systemToUser }
import { conversationHeaderSource, resolveRelayAffinityPck } from "../session-id.js";
import { MSG_IDS_BODY_FIELD, applyMsgIdPin, validateMsgIds } from "../msgid-pin.js";
import { pluginAgentHeader } from "../plugin.js";
import { applyReasoningDrop, diagNudge, diagTagSummary, deriveTitle, effectiveTokenCount, imageBillingFor, imageReserveFor, imageTokenCapFor, isAutoInjectedNotification, planReasoningDrop, reapOrphansLogged, resolveKnownOutputCeiling, runNudgeDecision, stripKernelSummaries, warnDroppedOpenaiParts, warnReasoningPairs, type Prepared } from "../server.js";
import { applyReasoningDrop, diagNudge, diagTagSummary, deriveTitle, effectiveTokenCount, imageBillingFor, imageReserveFor, imageTokenCapFor, isAutoInjectedNotification, isTagShapedText, planReasoningDrop, reapOrphansLogged, resolveKnownOutputCeiling, runNudgeDecision, stripKernelSummaries, warnDroppedOpenaiParts, warnReasoningPairs, type Prepared } from "../server.js";
import { recordNudgeObservation } from "../context-analysis.js";
import { yieldToEventLoop } from "../yield-loop.js";
import { buildDecisionPrompt, buildDirectiveText, consumeFallback, ladderMode, resolveDecisionRange, stripDecisionReasoningFields, type DecideConfig } from "../nudge-decide.js";
Expand Down Expand Up @@ -356,7 +356,7 @@ export async function prepareOpenai(
nudge = turn.nudge;
session.stats.contextTokens = tokenCount;
session.stats.contextTokensSource = tokenCountSource;
if (!session.meta.title || isAutoInjectedNotification(session.meta.title)) {
if (!session.meta.title || isAutoInjectedNotification(session.meta.title) || isTagShapedText(session.meta.title)) {
const t = deriveTitle(msgs);
if (t) session.meta.title = t;
}
Expand Down
4 changes: 2 additions & 2 deletions src/server/prepare-responses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { CompressReasoningConfig } from "../reasoning-drop.js";
import { resolveAbsorbSettings } from "../compress-settings.js";
import { effectivePromptCacheRouting, resolveCompressProtocol, type CompressSettings, type ProxyOptions } from "../config.js";
import { currentCalibrationFactor, strippedResponseIdWarning } from "../util.js";
import { applyReasoningDrop, diagNudge, diagTagSummary, deriveTitle, effectiveTokenCount, imageBillingFor, imageReserveFor, imageTokenCapFor, isAutoInjectedNotification, planReasoningDrop, reapOrphansLogged, resolveKnownOutputCeiling, runNudgeDecision, stripKernelSummaries, usageGradeInputBaseline, warnResponsesReasoningPairs, type Prepared } from "../server.js";
import { applyReasoningDrop, diagNudge, diagTagSummary, deriveTitle, effectiveTokenCount, imageBillingFor, imageReserveFor, imageTokenCapFor, isAutoInjectedNotification, isTagShapedText, planReasoningDrop, reapOrphansLogged, resolveKnownOutputCeiling, runNudgeDecision, stripKernelSummaries, usageGradeInputBaseline, warnResponsesReasoningPairs, type Prepared } from "../server.js";
import { collectSeparatorManifest, repairResponsesAssistantOrdering, type SeparatorSlot } from "./responses-ordering.js";
import { recordNudgeObservation } from "../context-analysis.js";
import { yieldToEventLoop } from "../yield-loop.js";
Expand Down Expand Up @@ -382,7 +382,7 @@ reconcileFoldCoverage(session, msgs, { mode: foldMode, sessionId, log, markerStr
nudge = turn.nudge;
session.stats.contextTokens = tokenCount;
session.stats.contextTokensSource = tokenCountSource;
if (!session.meta.title || isAutoInjectedNotification(session.meta.title)) {
if (!session.meta.title || isAutoInjectedNotification(session.meta.title) || isTagShapedText(session.meta.title)) {
const t = deriveTitle(msgs);
if (t) session.meta.title = t;
}
Expand Down
25 changes: 25 additions & 0 deletions src/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1621,6 +1621,31 @@ export function splitSessionWarnings(sessions: Session[], now: number = Date.now
return out;
}

// #4776: splitSessionWarnings is the #2165 stolen-anchor canary — it only fires
// when several sessions SHARE one id base (`|sub:` children), so it is structurally
// blind to anonymous prefix-affinity forks: every pfa-* fork owns a unique id, and an
// anonymous-heavy deployment reads [] while one conversation split dozens of times.
// This reports what bili actually knows from session metadata: how many in-memory
// sessions carry no client-provided identity, and how many were born as a fork
// (diverged shared prefix) or truncated replay (compaction/resume dropped the head)
// of another anonymous session's history.
interface AnonymousIdentitySummary {
total: number;
forkBorn: number;
truncatedBorn: number;
}
export function anonymousIdentitySummary(sessions: Session[]): AnonymousIdentitySummary {
let total = 0, forkBorn = 0, truncatedBorn = 0;
for (const s of sessions) {
const apa = s.metadata?.anonymousPrefixAffinity as { lineage?: { reason?: string } } | undefined;
if (!apa) continue;
total++;
if (apa.lineage?.reason === "forked") forkBorn++;
else if (apa.lineage?.reason === "truncated") truncatedBorn++;
}
return { total, forkBorn, truncatedBorn };
}

/** Read-only in-memory lookup. Unlike getSession, never creates or reloads a
* session — used by the plugin tool API, which must not conjure state for a
* conversation it has never seen. */
Expand Down
Loading
Loading