Skip to content

Commit 9f824fb

Browse files
committed
默认开启session 识别
1 parent 0b0a999 commit 9f824fb

9 files changed

Lines changed: 113 additions & 18 deletions

‎config.example.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,13 @@ identity:
6565
# Leave empty on Android — the app injects ZCODE_IDENTITY_DEVICE_MID instead.
6666
deviceMid: ""
6767

68-
# Local client-session inference for cache-affinity experiments.
69-
# "observe" (default) logs inferred sessions in debug mode but does not change
70-
# upstream x-session-id. "enforce" reuses a stable x-session-id for inferred
71-
# coding-plan sessions. "off" disables inference entirely.
68+
# Local client-session inference for upstream session affinity.
69+
# "enforce" (default) forwards a stable x-session-id for inferred sessions
70+
# (cache affinity + closer to the official client, whose signing template
71+
# always carries a session id). "observe" logs inferred sessions in debug
72+
# mode without changing upstream x-session-id. "off" disables inference.
7273
clientIdentity:
73-
mode: observe
74+
mode: enforce
7475
ttlSeconds: 900
7576
maxSessions: 1024
7677

‎src/config/loader.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ logging:
125125
expect(cfg.logging.level).toBe("info");
126126
expect(cfg.providers.zai.anthropicBase).toBe("https://api.z.ai/api/anthropic");
127127
expect(cfg.providers.bigmodel.openaiBase).toBe("https://open.bigmodel.cn/api/coding/paas/v4");
128-
expect(cfg.clientIdentity).toEqual({ mode: "observe", ttlSeconds: 900, maxSessions: 1024 });
128+
expect(cfg.clientIdentity).toEqual({ mode: "enforce", ttlSeconds: 900, maxSessions: 1024 });
129129
expect(cfg.responses).toEqual({ enabled: true, storeMaxEntries: 1000, storeTtlMs: 86400000 });
130130
expect(cfg.mcp).toEqual({ enabled: true, webSearch: true, webReader: false, zread: false, gateway: { enabled: true, upstreamOrigin: "https://zcode.z.ai" } });
131131
expect(cfg.async).toEqual({

‎src/config/loader.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const DEFAULTS = {
4747
APP_VERSION: DEFAULT_APP_VERSION,
4848
SOURCE_TITLE: "cli",
4949
REFERER_ORIGIN: "https://zcode.z.ai",
50-
CLIENT_IDENTITY_MODE: "observe" as const,
50+
CLIENT_IDENTITY_MODE: "enforce" as const,
5151
CLIENT_IDENTITY_TTL_SECONDS: 900,
5252
CLIENT_IDENTITY_MAX_SESSIONS: 1024,
5353
RESPONSES_ENABLED: true,

‎src/config/template.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,13 @@ identity:
7474
# Leave empty on Android — the app injects ZCODE_IDENTITY_DEVICE_MID instead.
7575
deviceMid: ""
7676
77-
# Local client-session inference for cache-affinity experiments.
78-
# "observe" (default) logs inferred sessions in debug mode but does not change
79-
# upstream x-session-id. "enforce" reuses a stable x-session-id for inferred
80-
# coding-plan sessions. "off" disables inference entirely.
77+
# Local client-session inference for upstream session affinity.
78+
# "enforce" (default) forwards a stable x-session-id for inferred sessions
79+
# (cache affinity + closer to the official client, whose signing template
80+
# always carries a session id). "observe" logs inferred sessions in debug
81+
# mode without changing upstream x-session-id. "off" disables inference.
8182
clientIdentity:
82-
mode: observe
83+
mode: enforce
8384
ttlSeconds: 900
8485
maxSessions: 1024
8586

‎src/config/types.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ export interface ProxyIdentity {
5050

5151
/** Local client-session inference mode for upstream session affinity. */
5252
export interface ClientIdentityConfig {
53-
/** "observe" logs/instruments only; "enforce" reuses upstream x-session-id; "off" disables inference. */
53+
/**
54+
* "enforce" (default) forwards a stable x-session-id for inferred sessions
55+
* (cache affinity; the official signing template always carries a session
56+
* id); "observe" logs only; "off" disables inference.
57+
*/
5458
mode: "off" | "observe" | "enforce";
5559
/** In-memory session TTL in seconds. */
5660
ttlSeconds: number;

‎src/proxy/client-session.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,31 @@ describe("client session resolver", () => {
6969
expect(result.upstreamSessionId).toBe("claude_session_1");
7070
});
7171

72+
it("recognizes the expanded explicit-session header set (Claude Code non-x, VSCode family)", () => {
73+
const resolver = createClientSessionResolver();
74+
const body = JSON.stringify({ model: "glm-4.6", messages: [{ role: "user", content: "Hi" }] });
75+
76+
// Claude Code SDK variant without the x- prefix
77+
expect(resolver.resolve(makeReq(body, { "claude-code-session-id": "cc_nox_1" }), body, "anthropic", "glm-4.6", CFG)
78+
.sessionId).toBe("cc_nox_1");
79+
// VSCode family (Google Antigravity sends x-vscode-sessionid per launch)
80+
expect(resolver.resolve(makeReq(body, { "x-vscode-sessionid": "vs_sess_1" }), body, "anthropic", "glm-4.6", CFG)
81+
.sessionId).toBe("vs_sess_1");
82+
// Claude Code per-request id feeds requestId detection
83+
expect(resolver.resolve(makeReq(body, { "x-client-request-id": "ccr_1" }), body, "anthropic", "glm-4.6", CFG)
84+
.requestId).toBe("ccr_1");
85+
});
86+
87+
it("prefers tool-specific session headers over the generic x-session-id", () => {
88+
const resolver = createClientSessionResolver();
89+
const body = JSON.stringify({ model: "glm-4.6", messages: [{ role: "user", content: "Hi" }] });
90+
const result = resolver.resolve(makeReq(body, {
91+
"x-vscode-sessionid": "vs_specific_1",
92+
"x-session-id": "generic_1",
93+
}), body, "anthropic", "glm-4.6", CFG);
94+
expect(result.sessionId).toBe("vs_specific_1");
95+
});
96+
7297
it("keeps existing snake_case metadata session fallbacks", () => {
7398
const resolver = createClientSessionResolver();
7499
const body = JSON.stringify({

‎src/proxy/client-session.ts‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,39 @@ function result(source: ClientSessionSource, action: ClientSessionAction, node:
140140
};
141141
}
142142

143+
// Explicit session-id headers, tool-specific before generic (first match wins).
144+
// Evidence (2026-10-11, real-source survey):
145+
// - x-opencode-session OpenCode harness
146+
// - x-claude-code-session-id Claude Code 2.1.87+ (gateway protocol; also
147+
// paired with x-app: cli / x-stainless-*)
148+
// - claude-code-session-id non-x variant some Claude Code SDK clients send
149+
// - x-vscode-sessionid VSCode family — Google Antigravity sends it
150+
// per app launch (agproxy/Antigravity-Manager 抓包)
151+
// - x-session-id generic convention
152+
// - x-parent-session-id subagent lineage
153+
// - helicone-session-id Helicone proxy convention
154+
// Not added: x-machine-id (machine-granular — would fuse every conversation of
155+
// a machine into one affinity session); x-claude-code-agent-id/-parent-agent-id
156+
// (agent lineage, not conversation identity). SillyTavern has NO native session
157+
// header (thin-server: its Express backend sends only auth/content-type plus
158+
// user-configured additional headers — users can set x-session-id themselves).
159+
const SESSION_ID_HEADERS = [
160+
"x-opencode-session",
161+
"x-claude-code-session-id",
162+
"claude-code-session-id",
163+
"x-vscode-sessionid",
164+
"x-session-id",
165+
"x-parent-session-id",
166+
"helicone-session-id",
167+
];
168+
143169
function requestTraceContext(req: Request, body: string | undefined): ExplicitTraceContext {
144170
const bodyTrace = bodyMetadataTrace(body);
145171
return {
146-
requestId: firstHeader(req.headers, ["x-request-id"]) ?? bodyTrace.requestId,
172+
requestId: firstHeader(req.headers, ["x-request-id", "x-client-request-id"]) ?? bodyTrace.requestId,
147173
traceId: firstHeader(req.headers, ["x-zcode-trace-id"]) ?? bodyTrace.traceId,
148174
queryId: firstHeader(req.headers, ["x-query-id"]) ?? bodyTrace.queryId,
149-
sessionId: firstHeader(req.headers, ["x-opencode-session", "x-claude-code-session-id", "x-session-id", "x-parent-session-id", "helicone-session-id"])
175+
sessionId: firstHeader(req.headers, SESSION_ID_HEADERS)
150176
?? bodyTrace.sessionId,
151177
};
152178
}

‎src/proxy/handler-routing-signing.test.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,34 @@ describe("proxyRequest endpoint-routing + client-signing wiring", () => {
178178
expect(capturedHeaders!.get("x-client-pow")).toBeNull();
179179
expect(capturedHeaders!.get("x-app-id")).toBeNull();
180180
});
181+
182+
// Regression: exact trace contexts without a resolvable session id
183+
// (degenerate bodies / requestId-only requests) must still carry a
184+
// synthesized x-session-id so coding-plan signing never silently skips.
185+
for (const [label, cfg, headers, body] of [
186+
["enforce + degenerate body", { ...TEST_CONFIG, clientIdentity: { mode: "enforce" as const, ttlSeconds: 900, maxSessions: 1024 } }, {}, JSON.stringify({ model: "glm-4.6", max_tokens: 32 })],
187+
["observe + requestId-only", { ...TEST_CONFIG, clientIdentity: { mode: "observe" as const, ttlSeconds: 900, maxSessions: 1024 } }, { "x-request-id": "req_only_1" }, JSON.stringify({ model: "glm-4.6", max_tokens: 32, messages: [{ role: "user", content: "hi" }] })],
188+
] as const) {
189+
it(`signs coding-plan requests with no resolvable session (${label})`, async () => {
190+
const { manager } = await buildSigningManagerFixture();
191+
let capturedHeaders: Headers | undefined;
192+
const resp = await proxyRequest(new Request("http://localhost:8080/v1/messages", {
193+
method: "POST",
194+
headers: { "content-type": "application/json", ...headers },
195+
body,
196+
}), "anthropic", {
197+
config: cfg,
198+
auth: oauthAuth(CRED),
199+
fetchImpl: Object.assign(async (input: RequestInfo | URL) => {
200+
capturedHeaders = input instanceof Request ? input.headers : new Headers();
201+
return anthropicOk();
202+
}, { preconnect: () => {} }) as typeof fetch,
203+
endpointRouting: null,
204+
clientSigning: manager,
205+
});
206+
expect(resp.status).toBe(200);
207+
expect(capturedHeaders!.get("x-session-id")).toMatch(/^[0-9a-f-]{36}$/);
208+
expect(capturedHeaders!.get("x-client-sig")).toBeDefined();
209+
});
210+
}
181211
});

‎src/proxy/upstream.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@ export function buildUpstreamURL(format: Format, provider: ProviderDef, plan: "c
108108
*
109109
* Trace/attribution headers mirror the bundle's `Bdt`
110110
* ("createModelRequestAttributionHeaders") when an explicit/enforced trace
111-
* context exists. Default observe mode keeps the prior synthesized query/session
112-
* behavior for compatibility.
111+
* context exists. Default enforce mode forwards the inferred conversation
112+
* session id; sessions without a resolvable id fall back to a synthesized
113+
* one (coding-plan must always carry x-session-id — signing requires it).
113114
*/
114115
export function buildAuthHeaders(
115116
format: Format,
@@ -151,11 +152,18 @@ export function buildAuthHeaders(
151152

152153
function buildTraceHeaders(plan: "coding-plan" | "start-plan", clientSession?: UpstreamClientSession): Record<string, string> {
153154
if (shouldUseExactTraceHeaders(plan, clientSession)) {
155+
// Degenerate bodies (lineage failed) and requestId-only requests resolve
156+
// to an exact context with NO session id — coding-plan would then ship
157+
// without x-session-id and signing would skip (client-signing requires
158+
// it), violating the "coding-plan 必签" invariant. Synthesize like the
159+
// fallback branch; start-plan is never signed and keeps the omission.
160+
const sessionId = sessionIdForHeader(clientSession)
161+
?? (plan === "coding-plan" ? crypto.randomUUID() : undefined);
154162
return buildZcodeTraceHeaders({
155163
requestId: clientSession?.requestId,
156164
traceId: clientSession?.traceId,
157165
queryId: clientSession?.queryId,
158-
sessionId: sessionIdForHeader(clientSession),
166+
sessionId,
159167
});
160168
}
161169

0 commit comments

Comments
 (0)