pi-tsgw 3.3.0 → 3.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md
CHANGED
|
@@ -27,6 +27,8 @@ pi install npm:pi-tsgw
|
|
|
27
27
|
将占位地址替换为实际网关地址,通过 `/login` 选择 `tsgw` 配置密钥,然后执行 `/reload`。
|
|
28
28
|
使用 `/tsgw` 查看目录状态,`/tsgw-refresh` 强制刷新。
|
|
29
29
|
|
|
30
|
+
网关追踪头默认开启:`AH-Thread-Id` 和 `X-Magpie-Session` 使用真实会话 ID,`AH-Trace-Id` 关联真实用户消息;压缩、摘要等请求不冒充用户消息追踪。仅补充指向已配置网关的 `tsgw` 聊天请求,保留调用方已有同名头。可在 `settings.json` 的 `tsgw` 中设置 `"traceHeaders": false` 关闭插件补头,但不禁用宿主原生会话头或网关侧记录;网关已开启对话记录时,会话标识可能使其归集并保存对话。
|
|
31
|
+
|
|
30
32
|
`/insagent` 显式安装标准子代理:覆盖当前定义,删除已退出清单的 `tsgw-*.md`,在代理目录的 `settings.json` 中启用 Agent 并停用 Pi Web 内置代理,最后自动重载当前会话;其他自定义代理和无关设置保留。
|
|
31
33
|
|
|
32
34
|
## 工具入口
|
|
@@ -7,13 +7,13 @@ import { ANTHROPIC_COMPAT } from "./_protocols.ts";
|
|
|
7
7
|
* 规格/定价以网关目录为准(opus/sonnet 两档)。
|
|
8
8
|
*/
|
|
9
9
|
export function anthropicModels(root: string): ProviderModelConfig[] {
|
|
10
|
-
|
|
10
|
+
// 宿主 SDK 会追加 /v1/messages,基地址不再加厂商路径。
|
|
11
11
|
return [
|
|
12
12
|
{
|
|
13
13
|
id: "claude-opus-5",
|
|
14
14
|
name: "Claude Opus 5",
|
|
15
15
|
api: "anthropic-messages",
|
|
16
|
-
baseUrl:
|
|
16
|
+
baseUrl: root,
|
|
17
17
|
reasoning: true,
|
|
18
18
|
thinkingLevelMap: {
|
|
19
19
|
low: "low",
|
|
@@ -32,7 +32,7 @@ export function anthropicModels(root: string): ProviderModelConfig[] {
|
|
|
32
32
|
id: "claude-sonnet-5",
|
|
33
33
|
name: "Claude Sonnet 5",
|
|
34
34
|
api: "anthropic-messages",
|
|
35
|
-
baseUrl:
|
|
35
|
+
baseUrl: root,
|
|
36
36
|
reasoning: true,
|
|
37
37
|
thinkingLevelMap: {
|
|
38
38
|
low: "low",
|
|
@@ -20,7 +20,7 @@ import { isPlainObject, type PayloadWriter, type ThinkingApplier, type ThinkingL
|
|
|
20
20
|
* 未知零价占位与思考策略;正式版规格不因此变化。
|
|
21
21
|
*/
|
|
22
22
|
export function minimaxModels(root: string): ProviderModelConfig[] {
|
|
23
|
-
|
|
23
|
+
// 宿主 SDK 会追加 /v1/messages,基地址不再加厂商路径。
|
|
24
24
|
// MiniMax 不要求 Claude 签名,复用宿主以保留空签名 thinking 块。
|
|
25
25
|
const compat = { ...ANTHROPIC_COMPAT, allowEmptySignature: true };
|
|
26
26
|
return [
|
|
@@ -28,7 +28,7 @@ export function minimaxModels(root: string): ProviderModelConfig[] {
|
|
|
28
28
|
id: "MiniMax-M3.1-Flash",
|
|
29
29
|
name: "MiniMax-M3.1-Flash",
|
|
30
30
|
api: "anthropic-messages",
|
|
31
|
-
baseUrl:
|
|
31
|
+
baseUrl: root,
|
|
32
32
|
reasoning: true,
|
|
33
33
|
thinkingLevelMap: {
|
|
34
34
|
off: null,
|
|
@@ -49,7 +49,7 @@ export function minimaxModels(root: string): ProviderModelConfig[] {
|
|
|
49
49
|
id: "MiniMax-M3",
|
|
50
50
|
name: "MiniMax-M3",
|
|
51
51
|
api: "anthropic-messages",
|
|
52
|
-
baseUrl:
|
|
52
|
+
baseUrl: root,
|
|
53
53
|
reasoning: true,
|
|
54
54
|
input: ["text", "image"],
|
|
55
55
|
cost: {
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
VERSION,
|
|
11
11
|
} from "@earendil-works/pi-coding-agent";
|
|
12
12
|
import { join } from "node:path";
|
|
13
|
-
import {
|
|
13
|
+
import { registerGatewayTracing } from "./tracing.ts";
|
|
14
14
|
import {
|
|
15
15
|
DEFAULT_ROOT,
|
|
16
16
|
PROVIDER_ID,
|
|
@@ -64,15 +64,6 @@ function rootForRuntime(configured: string | undefined): string {
|
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
function hasHeader(
|
|
68
|
-
headers: Record<string, string | null>,
|
|
69
|
-
name: string,
|
|
70
|
-
): boolean {
|
|
71
|
-
return Object.keys(headers).some(
|
|
72
|
-
(key) => key.toLowerCase() === name.toLowerCase(),
|
|
73
|
-
);
|
|
74
|
-
}
|
|
75
|
-
|
|
76
67
|
function requestStateFor(
|
|
77
68
|
model: RequestModel | undefined,
|
|
78
69
|
thinkingLevel: ThinkingLevel,
|
|
@@ -87,17 +78,6 @@ function requestStateFor(
|
|
|
87
78
|
};
|
|
88
79
|
}
|
|
89
80
|
|
|
90
|
-
function isTsgwTraceTarget(state: RequestState, root: string): boolean {
|
|
91
|
-
if (state.provider !== PROVIDER_ID) return false;
|
|
92
|
-
try {
|
|
93
|
-
// 仅追踪发往已配置网关根地址的请求,避免为在其他位置
|
|
94
|
-
// 覆盖了 baseUrl 的模型添加追踪请求头。
|
|
95
|
-
return new URL(state.baseUrl).hostname === new URL(root).hostname;
|
|
96
|
-
} catch {
|
|
97
|
-
return false;
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
|
|
101
81
|
/** 模型缓存文件:<agent-dir>/tsgw/models-cache.json。 */
|
|
102
82
|
function gatewayModelCachePath(): string {
|
|
103
83
|
return join(getAgentDir(), "tsgw", "models-cache.json");
|
|
@@ -121,7 +101,7 @@ export async function registerTsgwProvider(
|
|
|
121
101
|
settings.tsSearch === "cached" || settings.tsSearch === "live"
|
|
122
102
|
? settings.tsSearch
|
|
123
103
|
: "live";
|
|
124
|
-
const traceEnabled = settings.traceHeaders
|
|
104
|
+
const traceEnabled = settings.traceHeaders !== false;
|
|
125
105
|
const modelFilter: ModelFilter = {
|
|
126
106
|
include: settings.includeModels,
|
|
127
107
|
exclude: settings.excludeModels,
|
|
@@ -359,18 +339,5 @@ export async function registerTsgwProvider(
|
|
|
359
339
|
return applyModelOperations(event.payload, context);
|
|
360
340
|
});
|
|
361
341
|
|
|
362
|
-
if (
|
|
363
|
-
const threadId = randomUUID();
|
|
364
|
-
let traceId = randomUUID();
|
|
365
|
-
pi.on("agent_start", () => {
|
|
366
|
-
traceId = randomUUID();
|
|
367
|
-
});
|
|
368
|
-
pi.on("before_provider_headers", (event) => {
|
|
369
|
-
const state = requestState;
|
|
370
|
-
if (!state || !isTsgwTraceTarget(state, root)) return;
|
|
371
|
-
if (!hasHeader(event.headers, "AH-Thread-Id"))
|
|
372
|
-
event.headers["AH-Thread-Id"] = threadId;
|
|
373
|
-
if (!hasHeader(event.headers, "AH-Trace-Id"))
|
|
374
|
-
event.headers["AH-Trace-Id"] = traceId;
|
|
375
|
-
});
|
|
342
|
+
if (traceEnabled) registerGatewayTracing(pi, root);
|
|
376
343
|
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
|
|
2
|
+
import { PROVIDER_ID } from "#tsgw/models/catalog";
|
|
3
|
+
|
|
4
|
+
/** 会话身份取自宿主;用户消息入库后才确定消息级追踪身份。 */
|
|
5
|
+
export function registerGatewayTracing(pi: ExtensionAPI, root: string): void {
|
|
6
|
+
let active = false;
|
|
7
|
+
let chatting = false;
|
|
8
|
+
let customRunUserId: string | undefined;
|
|
9
|
+
|
|
10
|
+
pi.on("before_agent_start", (event, ctx) => {
|
|
11
|
+
// 独立自定义任务不冒用上一条用户消息;附加上下文则不改变归属。
|
|
12
|
+
customRunUserId = event.messageType === "custom"
|
|
13
|
+
? latestUserEntryId(ctx.sessionManager) : undefined;
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
pi.on("session_start", () => { active = true; chatting = false; });
|
|
17
|
+
pi.on("session_shutdown", () => { active = false; chatting = false; });
|
|
18
|
+
pi.on("agent_start", () => { chatting = true; });
|
|
19
|
+
pi.on("turn_start", () => { chatting = true; });
|
|
20
|
+
pi.on("agent_end", () => { chatting = false; });
|
|
21
|
+
// 压缩、分支摘要不是最近一条用户消息的普通续答;只关联会话。
|
|
22
|
+
pi.on("session_before_compact", () => { chatting = false; });
|
|
23
|
+
pi.on("session_before_tree", () => { chatting = false; });
|
|
24
|
+
|
|
25
|
+
pi.on("before_provider_headers", (event, ctx) => {
|
|
26
|
+
if (!active || !matchesGateway(ctx.model, root)) return;
|
|
27
|
+
const sessionId = ctx.sessionManager.getSessionId();
|
|
28
|
+
if (!sessionId) return;
|
|
29
|
+
setMissingHeader(event.headers, "AH-Thread-Id", sessionId);
|
|
30
|
+
setMissingHeader(event.headers, "X-Magpie-Session", sessionId);
|
|
31
|
+
if (!chatting) return;
|
|
32
|
+
const entryId = latestUserEntryId(ctx.sessionManager);
|
|
33
|
+
if (entryId && entryId !== customRunUserId)
|
|
34
|
+
setMissingHeader(event.headers, "AH-Trace-Id", `${sessionId}.${entryId}`);
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
function matchesGateway(
|
|
39
|
+
model: ExtensionContext["model"], root: string,
|
|
40
|
+
): boolean {
|
|
41
|
+
if (model?.provider !== PROVIDER_ID) return false;
|
|
42
|
+
try {
|
|
43
|
+
const url = new URL(model.baseUrl);
|
|
44
|
+
const target = new URL(root);
|
|
45
|
+
const rootPath = target.pathname.replace(/\/$/, "");
|
|
46
|
+
return url.origin === target.origin &&
|
|
47
|
+
(url.pathname === rootPath || url.pathname.startsWith(`${rootPath}/`));
|
|
48
|
+
} catch {
|
|
49
|
+
return false;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
function latestUserEntryId(manager: ExtensionContext["sessionManager"]): string | undefined {
|
|
54
|
+
let entry = manager.getLeafEntry();
|
|
55
|
+
while (entry) {
|
|
56
|
+
if (entry.type === "message" && entry.message.role === "user") return entry.id;
|
|
57
|
+
entry = entry.parentId ? manager.getEntry(entry.parentId) : undefined;
|
|
58
|
+
}
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function setMissingHeader(
|
|
63
|
+
headers: Record<string, string | null>, name: string, value: string,
|
|
64
|
+
): void {
|
|
65
|
+
if (!Object.keys(headers).some(key => key.toLowerCase() === name.toLowerCase()))
|
|
66
|
+
headers[name] = value;
|
|
67
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pi-tsgw",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.1",
|
|
4
4
|
"description": "面向 TOSSP AIH gateway 的 Pi 扩展:按厂商维护聊天与图片模型目录及思考策略,支持四种聊天协议、图片生成与编辑工具,以及原生 System One 分类模型。",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"keywords": [
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
]
|
|
29
29
|
},
|
|
30
30
|
"scripts": {
|
|
31
|
-
"test": "tsc -p tsconfig.test.json && node scripts/prepare-test-runtime.mjs && node dist/extensions/provider/index.test.js && node dist/extensions/provider/startup-catalog.test.js && node dist/extensions/provider/catalog-state.test.js && node dist/extensions/models/gateway-catalog-service.test.js && node dist/extensions/models/gateway-catalog-recovery.test.js && node dist/extensions/provider/catalog-coordinator.test.js && node dist/extensions/provider/catalog-coordination.test.js && node dist/extensions/provider/catalog-recovery.test.js && node dist/extensions/provider/catalog-host.test.js && node dist/extensions/provider/catalog-preemption-host.test.js && node dist/extensions/provider/classifier-host.test.js && node dist/extensions/delegation/policy.test.js && node dist/extensions/delegation/index.test.js && node dist/extensions/delegation/failure.test.js && node dist/extensions/delegation/parallel.test.js && node dist/extensions/delegation/parallel-host.test.js && node dist/extensions/delegation/host-integration.test.js && node dist/extensions/agents/install.test.js && node dist/extensions/agents/host-integration.test.js && node dist/extensions/prompts.test.js && node dist/extensions/provider/status.test.js && node dist/extensions/search/index.test.js && node dist/extensions/search/proxy.test.js && node dist/extensions/search/host-integration.test.js && node dist/extensions/provider/status-integration.test.js && node dist/extensions/provider/catalog-lifecycle.test.js && node dist/extensions/models/gateway-catalog-metadata.test.js && node dist/extensions/models/gateway-catalog-policy.test.js && node dist/extensions/models/operations.test.js && node dist/extensions/models/catalog.test.js && node dist/extensions/models/web-search.test.js && node dist/extensions/models/gateway-catalog.test.js && node dist/extensions/models/gateway-catalog-isolation.test.js && node dist/extensions/models/vendor-strategies.test.js && node dist/extensions/models/minimax-protocol.test.js && node dist/extensions/models/grok-new.test.js && node dist/extensions/models/openai-terra.test.js && node dist/extensions/models/gemini-new.test.js && node dist/extensions/models/longcat-new.test.js && node dist/extensions/models/capabilities.test.js && node dist/extensions/models/classifier-catalog.test.js && node dist/extensions/models/adapter/classifiers/adapter.test.js && node dist/extensions/models/image-catalog.test.js && node dist/extensions/models/adapter/images/parameters.test.js && node dist/extensions/models/adapter/images/input-budget.test.js && node dist/extensions/models/adapter/images/edit-request.test.js && node dist/extensions/models/adapter/images/image-data.test.js && node dist/extensions/models/adapter/images/response.test.js && node dist/extensions/models/adapter/images/stream-response.test.js && node dist/extensions/models/adapter/images/adapter.test.js && node dist/extensions/images/tool-files.test.js && node dist/extensions/images/tools.test.js && node dist/extensions/images/host-integration.test.js && node dist/extensions/images/tools-host.test.js && node dist/index.test.js && node dist/extensions/skills.test.js && node dist/extensions/skill-resources.test.js && node dist/extensions/upload/protocol.test.js && node dist/extensions/upload/schema.test.js && node dist/extensions/upload/uploader.test.js && node dist/extensions/upload/transport.test.js && node dist/extensions/upload/host-integration.test.js && node dist/extensions/upload/readiness-host.test.js && node dist/extensions/config.test.js && node dist/extensions/email/config.test.js && node dist/extensions/email/cache.test.js && node dist/extensions/email/imap-session.test.js && node dist/extensions/email/query.test.js && node dist/extensions/email/reader.test.js && node dist/extensions/email/body.test.js && node dist/extensions/email/mutations.test.js && node dist/extensions/email/mutations-safety.test.js && node dist/extensions/email/smtp.test.js && node dist/extensions/email/schema.test.js && node dist/extensions/email/tools.test.js && node dist/extensions/email/host-integration.test.js && node dist/extensions/email/file-access.test.js && node dist/extensions/email/reader-integrity.test.js && node dist/extensions/dav/config.test.js && node dist/extensions/dav/client.test.js && node dist/extensions/dav/write-transport.test.js && node dist/extensions/dav/calendar.test.js && node dist/extensions/dav/calendar-read-integrity.test.js && node dist/extensions/dav/calendar-write.test.js && node dist/extensions/dav/calendar-write-validation.test.js && node dist/extensions/dav/contacts.test.js && node dist/extensions/dav/contact-actions.test.js && node dist/extensions/dav/contact-integrity.test.js && node dist/extensions/dav/tools.test.js && node dist/extensions/dav/host-integration.test.js",
|
|
31
|
+
"test": "tsc -p tsconfig.test.json && node scripts/prepare-test-runtime.mjs && node dist/extensions/provider/index.test.js && node dist/extensions/provider/tracing.test.js && node dist/extensions/provider/tracing-host.test.js && node dist/extensions/provider/startup-catalog.test.js && node dist/extensions/provider/catalog-state.test.js && node dist/extensions/models/gateway-catalog-service.test.js && node dist/extensions/models/gateway-catalog-recovery.test.js && node dist/extensions/provider/catalog-coordinator.test.js && node dist/extensions/provider/catalog-coordination.test.js && node dist/extensions/provider/catalog-recovery.test.js && node dist/extensions/provider/catalog-host.test.js && node dist/extensions/provider/catalog-preemption-host.test.js && node dist/extensions/provider/classifier-host.test.js && node dist/extensions/delegation/policy.test.js && node dist/extensions/delegation/index.test.js && node dist/extensions/delegation/failure.test.js && node dist/extensions/delegation/parallel.test.js && node dist/extensions/delegation/parallel-host.test.js && node dist/extensions/delegation/host-integration.test.js && node dist/extensions/agents/install.test.js && node dist/extensions/agents/host-integration.test.js && node dist/extensions/prompts.test.js && node dist/extensions/provider/status.test.js && node dist/extensions/search/index.test.js && node dist/extensions/search/proxy.test.js && node dist/extensions/search/host-integration.test.js && node dist/extensions/provider/status-integration.test.js && node dist/extensions/provider/catalog-lifecycle.test.js && node dist/extensions/models/gateway-catalog-metadata.test.js && node dist/extensions/models/gateway-catalog-policy.test.js && node dist/extensions/models/operations.test.js && node dist/extensions/models/catalog.test.js && node dist/extensions/models/web-search.test.js && node dist/extensions/models/gateway-catalog.test.js && node dist/extensions/models/gateway-catalog-isolation.test.js && node dist/extensions/models/vendor-strategies.test.js && node dist/extensions/models/minimax-protocol.test.js && node dist/extensions/models/grok-new.test.js && node dist/extensions/models/openai-terra.test.js && node dist/extensions/models/gemini-new.test.js && node dist/extensions/models/longcat-new.test.js && node dist/extensions/models/capabilities.test.js && node dist/extensions/models/classifier-catalog.test.js && node dist/extensions/models/adapter/classifiers/adapter.test.js && node dist/extensions/models/image-catalog.test.js && node dist/extensions/models/adapter/images/parameters.test.js && node dist/extensions/models/adapter/images/input-budget.test.js && node dist/extensions/models/adapter/images/edit-request.test.js && node dist/extensions/models/adapter/images/image-data.test.js && node dist/extensions/models/adapter/images/response.test.js && node dist/extensions/models/adapter/images/stream-response.test.js && node dist/extensions/models/adapter/images/adapter.test.js && node dist/extensions/images/tool-files.test.js && node dist/extensions/images/tools.test.js && node dist/extensions/images/host-integration.test.js && node dist/extensions/images/tools-host.test.js && node dist/index.test.js && node dist/extensions/skills.test.js && node dist/extensions/skill-resources.test.js && node dist/extensions/upload/protocol.test.js && node dist/extensions/upload/schema.test.js && node dist/extensions/upload/uploader.test.js && node dist/extensions/upload/transport.test.js && node dist/extensions/upload/host-integration.test.js && node dist/extensions/upload/readiness-host.test.js && node dist/extensions/config.test.js && node dist/extensions/email/config.test.js && node dist/extensions/email/cache.test.js && node dist/extensions/email/imap-session.test.js && node dist/extensions/email/query.test.js && node dist/extensions/email/reader.test.js && node dist/extensions/email/body.test.js && node dist/extensions/email/mutations.test.js && node dist/extensions/email/mutations-safety.test.js && node dist/extensions/email/smtp.test.js && node dist/extensions/email/schema.test.js && node dist/extensions/email/tools.test.js && node dist/extensions/email/host-integration.test.js && node dist/extensions/email/file-access.test.js && node dist/extensions/email/reader-integrity.test.js && node dist/extensions/dav/config.test.js && node dist/extensions/dav/client.test.js && node dist/extensions/dav/write-transport.test.js && node dist/extensions/dav/calendar.test.js && node dist/extensions/dav/calendar-read-integrity.test.js && node dist/extensions/dav/calendar-write.test.js && node dist/extensions/dav/calendar-write-validation.test.js && node dist/extensions/dav/contacts.test.js && node dist/extensions/dav/contact-actions.test.js && node dist/extensions/dav/contact-integrity.test.js && node dist/extensions/dav/tools.test.js && node dist/extensions/dav/host-integration.test.js",
|
|
32
32
|
"test:upload:live": "tsc -p tsconfig.test.json && node scripts/prepare-test-runtime.mjs && node dist/extensions/upload/live.test.js"
|
|
33
33
|
},
|
|
34
34
|
"peerDependencies": {
|