@coralai/sps-cli 0.65.39 → 0.65.41
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/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +5 -0
- package/dist/commands/setup.js.map +1 -1
- package/dist/console/index.d.ts +7 -0
- package/dist/console/index.d.ts.map +1 -1
- package/dist/console/index.js +45 -29
- package/dist/console/index.js.map +1 -1
- package/dist/console/routes/chat.d.ts.map +1 -1
- package/dist/console/routes/chat.js +15 -1
- package/dist/console/routes/chat.js.map +1 -1
- package/dist/console-assets/assets/{ShowcasePage-BfmVOXlY.js → ShowcasePage-CIx-aCHv.js} +1 -1
- package/dist/console-assets/assets/{index-B9JkkiCa.js → index-CUvdk-Dg.js} +30 -30
- package/dist/console-assets/index.html +1 -1
- package/dist/openai-agent/mcp/managedMcp.d.ts.map +1 -1
- package/dist/openai-agent/mcp/managedMcp.js +5 -0
- package/dist/openai-agent/mcp/managedMcp.js.map +1 -1
- package/dist/openai-agent/memory/v2Bridge.d.ts +25 -0
- package/dist/openai-agent/memory/v2Bridge.d.ts.map +1 -0
- package/dist/openai-agent/memory/v2Bridge.js +99 -0
- package/dist/openai-agent/memory/v2Bridge.js.map +1 -0
- package/dist/openai-agent/runWorker.d.ts.map +1 -1
- package/dist/openai-agent/runWorker.js +29 -0
- package/dist/openai-agent/runWorker.js.map +1 -1
- package/dist/openai-agent/sandbox/execution.d.ts.map +1 -1
- package/dist/openai-agent/sandbox/execution.js +6 -3
- package/dist/openai-agent/sandbox/execution.js.map +1 -1
- package/dist/openai-agent/storage/compactingSession.d.ts +14 -0
- package/dist/openai-agent/storage/compactingSession.d.ts.map +1 -0
- package/dist/openai-agent/storage/compactingSession.js +56 -0
- package/dist/openai-agent/storage/compactingSession.js.map +1 -0
- package/dist/openai-agent/storage/session.d.ts +10 -0
- package/dist/openai-agent/storage/session.d.ts.map +1 -1
- package/dist/openai-agent/storage/session.js +20 -0
- package/dist/openai-agent/storage/session.js.map +1 -1
- package/dist/openai-agent/storage/workerStorage.d.ts +3 -2
- package/dist/openai-agent/storage/workerStorage.d.ts.map +1 -1
- package/dist/openai-agent/storage/workerStorage.js +4 -1
- package/dist/openai-agent/storage/workerStorage.js.map +1 -1
- package/dist/providers/llm/codexModel.d.ts +9 -0
- package/dist/providers/llm/codexModel.d.ts.map +1 -1
- package/dist/providers/llm/codexModel.js +26 -7
- package/dist/providers/llm/codexModel.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/openai-agent/storage/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/openai-agent/storage/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,13 +2,14 @@ import type { AgentProcessStartCommandV1 } from '../../runtime/index.js';
|
|
|
2
2
|
import { RunCheckpointStore } from './checkpoint.js';
|
|
3
3
|
import { InteractionStore } from './interaction.js';
|
|
4
4
|
import { WorkerOutputStore } from './output.js';
|
|
5
|
-
import {
|
|
5
|
+
import type { Session } from '@openai/agents';
|
|
6
6
|
import { WorkspaceStateStore } from './workspace.js';
|
|
7
7
|
import { ToolExecutionLedger } from './toolLedger.js';
|
|
8
8
|
import { WorkerRunMetricsStore } from './metrics.js';
|
|
9
9
|
export interface OpenAIAgentWorkerStorage {
|
|
10
10
|
resumed: boolean;
|
|
11
|
-
|
|
11
|
+
/** 传给 runner 的会话:`DurableAgentSession`,可能被官方压缩装饰器包了一层。 */
|
|
12
|
+
session?: Session;
|
|
12
13
|
checkpoint: RunCheckpointStore;
|
|
13
14
|
interactions: InteractionStore;
|
|
14
15
|
ledger: ToolExecutionLedger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerStorage.d.ts","sourceRoot":"","sources":["../../../src/openai-agent/storage/workerStorage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,0BAA0B,EAC3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"workerStorage.d.ts","sourceRoot":"","sources":["../../../src/openai-agent/storage/workerStorage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,0BAA0B,EAC3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,SAAS,EAAE,mBAAmB,CAAC;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,wBAAsB,+BAA+B,CACnD,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,wBAAwB,CAAC,CAuCnC"}
|
|
@@ -6,6 +6,7 @@ import { InteractionStore } from './interaction.js';
|
|
|
6
6
|
import { ExclusiveFileLock } from './lock.js';
|
|
7
7
|
import { WorkerOutputStore } from './output.js';
|
|
8
8
|
import { DurableAgentSession, ensureSessionMetadata, } from './session.js';
|
|
9
|
+
import { withResponsesCompaction } from './compactingSession.js';
|
|
9
10
|
import { WorkspaceStateStore } from './workspace.js';
|
|
10
11
|
import { ToolExecutionLedger } from './toolLedger.js';
|
|
11
12
|
import { WorkerRunMetricsStore } from './metrics.js';
|
|
@@ -15,9 +16,11 @@ export async function prepareOpenAIAgentWorkerStorage(start) {
|
|
|
15
16
|
const activeLock = await ExclusiveFileLock.acquire(resolve(start.sessionRoot, '.active-run.lock'), { sessionId: start.sessionId, runId: start.runId });
|
|
16
17
|
try {
|
|
17
18
|
const { resumed } = await ensureSessionMetadata(start);
|
|
18
|
-
const
|
|
19
|
+
const durable = start.conversationOwner.kind === 'local_session'
|
|
19
20
|
? await DurableAgentSession.open(start.sessionRoot, start.sessionId)
|
|
20
21
|
: undefined;
|
|
22
|
+
// 套官方压缩:store:false 下每轮重放全量历史,不压缩早晚撞上下文窗口(见 compactingSession)。
|
|
23
|
+
const session = durable ? withResponsesCompaction(durable, start) : undefined;
|
|
21
24
|
return {
|
|
22
25
|
resumed,
|
|
23
26
|
...(session ? { session } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerStorage.js","sourceRoot":"","sources":["../../../src/openai-agent/storage/workerStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"workerStorage.js","sourceRoot":"","sources":["../../../src/openai-agent/storage/workerStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAerD,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,KAAiC;IAEjC,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAChD,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAC9C,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CACnD,CAAC;IACF,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACvD,MAAM,OAAO,GACX,KAAK,CAAC,iBAAiB,CAAC,IAAI,KAAK,eAAe;YAC9C,CAAC,CAAC,MAAM,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC;YACpE,CAAC,CAAC,SAAS,CAAC;QAChB,gEAAgE;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9E,OAAO;YACL,OAAO;YACP,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,UAAU,EAAE,IAAI,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC;YACrD,YAAY,EAAE,IAAI,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC;YACrD,MAAM,EAAE,IAAI,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC;YAClD,OAAO,EAAE,IAAI,qBAAqB,CAChC,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,CACb;YACD,MAAM,EAAE,IAAI,iBAAiB,CAC3B,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,KAAK,CACZ;YACD,SAAS,EAAE,IAAI,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC;YACrD,KAAK,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE;SAClC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* @boundedContext smartarrange
|
|
10
10
|
*/
|
|
11
11
|
import { OpenAIResponsesModel, type Model } from '@openai/agents';
|
|
12
|
+
import OpenAI from 'openai';
|
|
12
13
|
import { type CodexCreds } from './codexAuth.js';
|
|
13
14
|
/**
|
|
14
15
|
* 构造一个走【自定义 URL + API Key】的 Responses Model(openai/chatgpt 生图适配器用):
|
|
@@ -23,4 +24,12 @@ export declare function buildRelayResponsesModel(baseUrl: string, apiKey: string
|
|
|
23
24
|
export declare function buildCodexModel(model: string, options?: {
|
|
24
25
|
resolveCredentials?: () => Promise<CodexCreds>;
|
|
25
26
|
}): Model;
|
|
27
|
+
/**
|
|
28
|
+
* 走 Codex 订阅的 OpenAI client(与 `buildCodexModel` 同一条链路:刷 token、注鉴权头、
|
|
29
|
+
* store:false、剥 apply_patch、修 SSE)。抽出来是给**不经 Model 的官方能力**用 ——
|
|
30
|
+
* 目前是 `OpenAIResponsesCompactionSession`(它直接调 `client.responses.compact`)。
|
|
31
|
+
*/
|
|
32
|
+
export declare function buildCodexOpenAIClient(options?: {
|
|
33
|
+
resolveCredentials?: () => Promise<CodexCreds>;
|
|
34
|
+
}): OpenAI;
|
|
26
35
|
//# sourceMappingURL=codexModel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codexModel.d.ts","sourceRoot":"","sources":["../../../src/providers/llm/codexModel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EACL,oBAAoB,EAEpB,KAAK,KAAK,EAEX,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"codexModel.d.ts","sourceRoot":"","sources":["../../../src/providers/llm/codexModel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EACL,oBAAoB,EAEpB,KAAK,KAAK,EAEX,MAAM,gBAAgB,CAAC;AACxB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AAmDxB;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAqB7G;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IACP,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;CAC3C,GACL,KAAK,CAIP;AA2DD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,GAAE;IAAE,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAA;CAAO,GAC/D,MAAM,CAMR"}
|
|
@@ -91,7 +91,11 @@ export function buildRelayResponsesModel(baseUrl, apiKey, model) {
|
|
|
91
91
|
* 修 SSE,并把非流式调用桥接成流式(见 withNonStreamingBridge —— 端点强制流式)。
|
|
92
92
|
*/
|
|
93
93
|
export function buildCodexModel(model, options = {}) {
|
|
94
|
-
|
|
94
|
+
return withNonStreamingBridge(new OpenAIResponsesModel(buildCodexOpenAIClient(options), model));
|
|
95
|
+
}
|
|
96
|
+
/** 组装 codex 专用 fetch:刷 token + 鉴权头 + store:false + 剥 reasoning/apply_patch + 修 SSE。 */
|
|
97
|
+
function makeCodexFetch(options) {
|
|
98
|
+
return async (url, init) => {
|
|
95
99
|
const creds = await (options.resolveCredentials ?? getCodexCreds)();
|
|
96
100
|
const headers = new Headers((init?.headers ?? undefined));
|
|
97
101
|
headers.set('authorization', `Bearer ${creds.accessToken}`);
|
|
@@ -103,11 +107,20 @@ export function buildCodexModel(model, options = {}) {
|
|
|
103
107
|
try {
|
|
104
108
|
const b = JSON.parse(body);
|
|
105
109
|
b.store = false;
|
|
106
|
-
// store:false
|
|
110
|
+
// store:false 下,服务端不持久化 reasoning item(rs_)→ 按 id 引用会 404
|
|
107
111
|
//("Item ... not found. Items are not persisted when store is set to false")。
|
|
108
|
-
//
|
|
112
|
+
// 🔴 只剥 id,不再整条丢弃:实测无 id 的 reasoning 项端点照常接受(200),
|
|
113
|
+
// 推理内容留着对后续轮次是有用上下文。会话侧的正门是
|
|
114
|
+
// `DurableAgentSession.prepareHistoryItemForModelInput`;这里是兜底 ——
|
|
115
|
+
// SDK 内部造的 agent(如记忆提炼)不经过我们的会话。
|
|
109
116
|
if (Array.isArray(b.input)) {
|
|
110
|
-
b.input = b.input.
|
|
117
|
+
b.input = b.input.map((it) => {
|
|
118
|
+
const item = it;
|
|
119
|
+
if (item?.type !== 'reasoning' || item.id === undefined)
|
|
120
|
+
return it;
|
|
121
|
+
const { id: _id, ...rest } = item;
|
|
122
|
+
return rest;
|
|
123
|
+
});
|
|
111
124
|
}
|
|
112
125
|
// codex 端点的工具白名单里没有 hosted apply_patch(实测 gpt-5.4/5.4-mini/5.5/5.6-sol
|
|
113
126
|
// 全部 400 `Unsupported tool type: apply_patch`,而同端点 web_search 是 200 —— 端点级,
|
|
@@ -142,12 +155,18 @@ export function buildCodexModel(model, options = {}) {
|
|
|
142
155
|
headers: res.headers,
|
|
143
156
|
});
|
|
144
157
|
};
|
|
145
|
-
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* 走 Codex 订阅的 OpenAI client(与 `buildCodexModel` 同一条链路:刷 token、注鉴权头、
|
|
161
|
+
* store:false、剥 apply_patch、修 SSE)。抽出来是给**不经 Model 的官方能力**用 ——
|
|
162
|
+
* 目前是 `OpenAIResponsesCompactionSession`(它直接调 `client.responses.compact`)。
|
|
163
|
+
*/
|
|
164
|
+
export function buildCodexOpenAIClient(options = {}) {
|
|
165
|
+
return new OpenAI({
|
|
146
166
|
baseURL: CODEX_RESPONSES_BASE,
|
|
147
167
|
apiKey: 'codex-subscription',
|
|
148
|
-
fetch:
|
|
168
|
+
fetch: makeCodexFetch(options),
|
|
149
169
|
});
|
|
150
|
-
return withNonStreamingBridge(new OpenAIResponsesModel(client, model));
|
|
151
170
|
}
|
|
152
171
|
/**
|
|
153
172
|
* **非流式 → 流式桥**。codex 端点强制 `stream:true`(非流式请求直接
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codexModel.js","sourceRoot":"","sources":["../../../src/providers/llm/codexModel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"codexModel.js","sourceRoot":"","sources":["../../../src/providers/llm/codexModel.ts"],"names":[],"mappings":"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"}
|