Skip to content

Commit 755344d

Browse files
committed
fix(acp): 持久化失效失败时保留运行中的会话
- 将指令失效写入失败记录为警告,保留待处理状态供订阅清理重试。 - 扩展现有所有权回归,确认事件继续投递且会话不被关闭。 - 适配主线 Digest 服务及驱动依赖,完成变更范围检查和 201 项测试。
1 parent 81cf36e commit 755344d

8 files changed

Lines changed: 41 additions & 8 deletions

File tree

‎apps/server/scripts/acp-mock-agent.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const failLoadSessionAfterConfigReplay =
6464
process.env.T3_ACP_FAIL_LOAD_SESSION_AFTER_CONFIG_REPLAY === "1";
6565
const emitLoadReplay = process.env.T3_ACP_EMIT_LOAD_REPLAY === "1";
6666
const failPrompt = process.env.T3_ACP_FAIL_PROMPT === "1";
67+
const echoAcceptedPrompt = process.env.T3_ACP_ECHO_ACCEPTED_PROMPT === "1";
6768
// JSON for the `data` of an "Internal error" response to `session/new`, as
6869
// Antigravity sends when its runtime cannot reach its local harness.
6970
const newSessionErrorData =
@@ -829,7 +830,7 @@ const program = Effect.gen(function* () {
829830
yield* agent.handlePrompt((request) =>
830831
Effect.gen(function* () {
831832
const requestedSessionId = String(request.sessionId ?? sessionId);
832-
if (process.env.T3_ACP_ECHO_ACCEPTED_PROMPT === "1") {
833+
if (echoAcceptedPrompt) {
833834
yield* agent.client.sessionUpdate({
834835
sessionId: requestedSessionId,
835836
update: {

‎apps/server/src/orchestration-v2/ProviderSessionManager.test.ts‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3467,6 +3467,7 @@ it.effect.each([
34673467
"contended-close",
34683468
"detached-close",
34693469
"failed-close",
3470+
"failed-event",
34703471
"newer-run",
34713472
"newer-session",
34723473
] as const)(
@@ -3530,6 +3531,12 @@ it.effect.each([
35303531
const subscription = yield* runtime.subscribeEvents!;
35313532
const queue = (yield* Ref.get(state)).eventQueues.get(String(providerSessionId));
35323533
assert.isDefined(queue);
3534+
if (owner === "failed-event") {
3535+
yield* Ref.set(
3536+
beforeUnchangedWrite,
3537+
Effect.fail(new EventSink.EventSinkWriteError({ eventCount: 1 })),
3538+
);
3539+
}
35333540
yield* Queue.offer(queue!, {
35343541
type: "provider_thread.updated",
35353542
driver: CODEX_DRIVER,
@@ -3588,6 +3595,14 @@ it.effect.each([
35883595
yield* subscription.events.pipe(
35893596
Stream.tap(() =>
35903597
Effect.gen(function* () {
3598+
if (owner === "failed-event") {
3599+
assert.isTrue(yield* manager.isLive(providerSessionId));
3600+
assert.deepEqual(
3601+
(yield* projectionStore.getThreadRecords(threadId, ["providerThreads"]))
3602+
.providerThreads[0]?.nativeMetadata?.acpInstructions,
3603+
before.nativeMetadata?.acpInstructions,
3604+
);
3605+
}
35913606
if (owner === "released-completion")
35923607
yield* manager.release({ providerSessionId, reason: "manual_shutdown" });
35933608
if (owner === "queued-completion" || owner === "released-completion")
@@ -3612,6 +3627,10 @@ it.effect.each([
36123627
Stream.runHead,
36133628
);
36143629
if (release !== undefined) yield* Fiber.join(release);
3630+
if (owner === "failed-event") {
3631+
assert.isTrue(yield* manager.isLive(providerSessionId));
3632+
assert.equal((yield* Ref.get(state)).closeCount, 0);
3633+
}
36153634
if (owner === "contended-close") assert.equal(conflicts, 4);
36163635
if (owner === "failed-close") yield* subscription.close;
36173636
if (owner === "repeated-close") {
@@ -3629,7 +3648,8 @@ it.effect.each([
36293648
owner === "released-completion" ||
36303649
owner === "repeated-close" ||
36313650
owner === "contended-close" ||
3632-
owner === "failed-close"
3651+
owner === "failed-close" ||
3652+
owner === "failed-event"
36333653
? {
36343654
...before,
36353655
nativeMetadata: {

‎apps/server/src/orchestration-v2/ProviderSessionManager.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,13 +2106,15 @@ export const layerWithOptions = (
21062106
}
21072107
}).pipe(entry.requestEventPermit.withPermits(1));
21082108
yield* persistInstructionInvalidation(entry, event.providerThread).pipe(
2109-
Effect.mapError(
2110-
(cause) =>
2111-
new ProviderAdapter.ProviderAdapterEventStreamError({
2112-
driver: entry.runtime.driver,
2109+
Effect.catch((cause) =>
2110+
Effect.logWarning(
2111+
"orchestration-v2.provider-session.instruction-invalidation-failed",
2112+
{
21132113
providerSessionId: entry.runtime.providerSessionId,
2114+
providerThreadId: event.providerThread.id,
21142115
cause,
2115-
}),
2116+
},
2117+
),
21162118
),
21172119
);
21182120
yield* publishToSubscribers(entry.eventSubscribers, { type: "event", event });

‎packages/provider-acp-registry/src/server/adapter.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type * as Digest from "effect/crypto/Digest";
12
import {
23
extractClaudeSubagentUpdate,
34
extractClaudeSubagentSessionEvent,
@@ -309,6 +310,7 @@ export const makeAcpRegistryAdapterV2 = Effect.fn("makeAcpRegistryAdapterV2")(fu
309310
});
310311

311312
export type AcpRegistryAdapterV2DriverEnv =
313+
| Digest.Digest
312314
| ChildProcessSpawner.ChildProcessSpawner
313315
| SecureRandom.SecureRandom
314316
| FileSystem.FileSystem

‎packages/provider-acp/src/server/adapter.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import {
4747
import { FILE_HEADERS_ONLY, formatPatch, structuredPatch } from "diff";
4848
import * as Cause from "effect/Cause";
4949
import * as Clock from "effect/Clock";
50+
import * as Digest from "effect/crypto/Digest";
5051
import * as SecureRandom from "effect/crypto/SecureRandom";
5152
import * as DateTime from "effect/DateTime";
5253
import * as Deferred from "effect/Deferred";
@@ -1684,6 +1685,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
16841685
options: AcpAdapterV2Options,
16851686
) {
16861687
const random = yield* SecureRandom.SecureRandom;
1688+
const crypto = yield* Digest.Digest;
16871689
const fileSystem = yield* FileSystem.FileSystem;
16881690
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
16891691
const agentScope = yield* AgentScope;
@@ -8006,7 +8008,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
80068008
} satisfies T3AcpInstructionState;
80078009
const instructionDigest = yield* crypto
80088010
.digest(
8009-
"SHA-256",
8011+
Digest.sha256,
80108012
new TextEncoder().encode(
80118013
t3AcpPromptWithInstructions({ prompt: "", state: instructionState }),
80128014
),

‎packages/provider-fx/src/server/adapter.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type * as Digest from "effect/crypto/Digest";
12
import * as HostProcess from "@t3tools/shared/HostProcess";
23
import { resolveSelfInvocation, type SelfInvocation } from "@t3tools/shared/nodeRuntime";
34
import { type OrchestrationV2ProviderCapabilities } from "@t3tools/contracts";
@@ -205,6 +206,7 @@ export const makeFxAdapterV2 = Effect.fn("makeFxAdapterV2")(function* (
205206
});
206207

207208
export type FxAdapterV2DriverEnv =
209+
| Digest.Digest
208210
| ChildProcessSpawner.ChildProcessSpawner
209211
| SecureRandom.SecureRandom
210212
| FileSystem.FileSystem

‎packages/provider-grok/src/server/adapter.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type * as Digest from "effect/crypto/Digest";
12
import { makeProviderFailure } from "@t3tools/provider-core/server/failure";
23
import {
34
XAiPromptFailureText,
@@ -357,6 +358,7 @@ export const makeGrokAdapterV2 = Effect.fn("makeGrokAdapterV2")(function* (
357358
});
358359

359360
export type GrokAdapterV2DriverEnv =
361+
| Digest.Digest
360362
| ChildProcessSpawner.ChildProcessSpawner
361363
| SecureRandom.SecureRandom
362364
| FileSystem.FileSystem

‎packages/provider-kiro/src/server/adapter.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type * as Digest from "effect/crypto/Digest";
12
import * as HostProcess from "@t3tools/shared/HostProcess";
23
import { resolveSelfInvocation, type SelfInvocation } from "@t3tools/shared/nodeRuntime";
34
import {
@@ -589,6 +590,7 @@ export const makeKiroAdapterV2 = Effect.fn("makeKiroAdapterV2")(function* (
589590
});
590591

591592
export type KiroAdapterV2DriverEnv =
593+
| Digest.Digest
592594
| ChildProcessSpawner.ChildProcessSpawner
593595
| SecureRandom.SecureRandom
594596
| FileSystem.FileSystem

0 commit comments

Comments
 (0)