Skip to content

Commit 636b768

Browse files
authored
Merge branch 'main' into refactor/codex-home-env-helper
2 parents 2915f2c + 6f41364 commit 636b768

27 files changed

Lines changed: 873 additions & 89 deletions

‎apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,22 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
563563
status: 429,
564564
},
565565
},
566+
{
567+
name: "a Claude limit without a reset timestamp",
568+
failureClass: "usage_limit",
569+
error: {
570+
type: "provider.unknown",
571+
message: "You've hit your session limit · resets 5:20pm (Europe/Berlin)",
572+
},
573+
},
574+
{
575+
name: "an unrelated provider.unknown failure",
576+
failureClass: "provider_error",
577+
error: {
578+
type: "provider.unknown",
579+
message: "Request failed. Resets at 2026-11-02T20:00:00Z.",
580+
},
581+
},
566582
] as const)("classifies $name as $failureClass", ({ error, failureClass }) =>
567583
Effect.gen(function* () {
568584
const { runtime, thread } = yield* resumed([
@@ -583,6 +599,35 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
583599
}).pipe(Effect.scoped),
584600
);
585601

602+
// regression: #29289 Claude weekly limits through claude-agent lost their usage-limit reset
603+
it.effect(
604+
"classifies a Claude weekly limit as a usage limit that resets at its reported time",
605+
() =>
606+
Effect.gen(function* () {
607+
const message =
608+
"You've hit your weekly limit · resets 9pm (Europe/Paris) Resets at 2026-11-02T20:00:00.000Z.";
609+
const { runtime, thread } = yield* resumed([
610+
out("session.prompt", { sessionID: SESSION, text: "<any>" }),
611+
promptAccepted,
612+
event("session.execution.failed", {
613+
sessionID: SESSION,
614+
error: { type: "provider.unknown", message },
615+
}),
616+
]);
617+
const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
618+
yield* runtime.startTurn(turnInput(thread));
619+
const ended = yield* Fiber.join(terminal);
620+
assert.equal(ended?.status, "failed");
621+
assert.deepEqual(ended?.failure, {
622+
class: "usage_limit",
623+
code: "provider.unknown",
624+
message,
625+
retryable: null,
626+
resetAt: "2026-11-02T20:00:00.000Z",
627+
});
628+
}).pipe(Effect.scoped),
629+
);
630+
586631
it.effect("ends the turn when its terminal event is one this build cannot decode", () =>
587632
Effect.gen(function* () {
588633
const { runtime, thread } = yield* resumed([

‎apps/server/src/provider/CodexDeveloperInstructions.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ describe("Codex orchestration context", () => {
6565

6666
NodeAssert.ok(orchestration.includes("use your native tool when the child uses your provider"));
6767
NodeAssert.ok(orchestration.includes("`run_in_background:false`"));
68-
NodeAssert.ok(orchestration.includes("A native type running another provider's model"));
68+
NodeAssert.ok(orchestration.includes("A native type on another provider's model"));
69+
NodeAssert.ok(
70+
orchestration.includes("Background agent: `delegate_task`, never a background `Agent`."),
71+
);
6972
NodeAssert.ok(
7073
orchestration.includes("Every new delegate review or re-check is a new `delegate_task`"),
7174
);

‎apps/server/src/provider/ProviderInstanceRegistry.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import {
99
type SecretReference,
1010
secretReferencesInSettings,
1111
type ServerProvider,
12+
type SettingsSecretSlot,
13+
withSettingsSecrets,
1214
} from "@t3tools/contracts";
1315
import * as Context from "effect/Context";
1416
import * as Effect from "effect/Effect";
@@ -45,7 +47,7 @@ export class ProviderInstanceRegistry extends Context.Service<
4547

4648
interface InstanceSecrets {
4749
readonly environment: ResolvedProviderInstanceEnvironment;
48-
readonly config: Readonly<Record<string, string>>;
50+
readonly config: ReadonlyArray<SettingsSecretSlot & { readonly value: string }>;
4951
}
5052

5153
interface LiveEntry {
@@ -110,12 +112,12 @@ const readInstanceSecrets = Effect.fn("ProviderInstanceRegistry.readInstanceSecr
110112
}
111113
return [{ ...variable, value: secret, sensitive: true }];
112114
});
113-
const config: Record<string, string> = {};
114-
for (const { field } of configFields) {
115+
const config = configFields.flatMap(({ field, key }) => {
115116
const secret = values[index++];
116-
if (secret === undefined) unreadable.push(field);
117-
else config[field] = secret;
118-
}
117+
if (secret !== undefined) return [{ field, key, value: secret }];
118+
unreadable.push(field);
119+
return [];
120+
});
119121
const secrets: InstanceSecrets = { environment, config };
120122
return { secrets, unreadable };
121123
});
@@ -224,7 +226,7 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
224226
const { secrets, unreadable } = enabled
225227
? yield* readInstanceSecrets(driver, entry)
226228
: {
227-
secrets: { environment: withoutSecretReferences(entry.environment ?? []), config: {} },
229+
secrets: { environment: withoutSecretReferences(entry.environment ?? []), config: [] },
228230
unreadable: [],
229231
};
230232
// Starting with a blank credential would fail later with a less useful error, or fall back to
@@ -252,9 +254,9 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
252254
environment: secrets.environment,
253255
enabled,
254256
config:
255-
Object.keys(secrets.config).length === 0
257+
secrets.config.length === 0
256258
? typedConfig
257-
: { ...typedConfig, ...secrets.config },
259+
: withSettingsSecrets(typedConfig, secrets.config),
258260
})
259261
.pipe(Effect.provideService(Scope.Scope, childScope), Effect.result);
260262
if (createResult._tag === "Failure") {

‎apps/server/src/relay/AgentAwarenessRelay.test.ts‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,113 @@ describe("AgentAwarenessRelay", () => {
482482
}),
483483
);
484484

485+
it.effect("publishes a cleared thread's tombstone once while it stays cleared", () =>
486+
Effect.gen(function* () {
487+
const { relay, currentShell, publications } = yield* makeTestRelay();
488+
yield* relay.publishThread(THREAD_ID);
489+
const completed = shell({ status: "completed" });
490+
yield* Ref.set(currentShell, completed);
491+
yield* relay.publishThread(THREAD_ID);
492+
yield* TestClock.adjust("5 seconds");
493+
yield* relay.drain;
494+
yield* Ref.set(currentShell, {
495+
...completed,
496+
settledOverride: "settled",
497+
settledAt: yield* DateTime.now,
498+
lastVisitedAt: null,
499+
});
500+
yield* relay.publishThread(THREAD_ID);
501+
yield* TestClock.adjust("5 seconds");
502+
yield* relay.drain;
503+
assert.deepEqual(
504+
publications.map((publication) => publication.state?.phase ?? null),
505+
["running", "completed", null],
506+
);
507+
508+
for (let i = 0; i < 3; i++) {
509+
yield* relay.publishThread(THREAD_ID);
510+
yield* TestClock.adjust("5 seconds");
511+
yield* relay.drain;
512+
}
513+
assert.deepEqual(
514+
publications.map((publication) => publication.state?.phase ?? null),
515+
["running", "completed", null],
516+
);
517+
}),
518+
);
519+
520+
it.effect("does not alert an old completion after publishing its thread's tombstone", () =>
521+
Effect.gen(function* () {
522+
const oldCompleted = shell({
523+
status: "completed",
524+
latestRunCompletedAt: DateTime.makeUnsafe("2026-09-04T11:59:00.000Z"),
525+
});
526+
yield* TestClock.setTime(DateTime.toEpochMillis(DateTime.makeUnsafe(NOW)));
527+
const { relay, currentShell, publications } = yield* makeTestRelay();
528+
yield* Ref.set(currentShell, {
529+
...oldCompleted,
530+
settledOverride: "settled",
531+
settledAt: DateTime.makeUnsafe(NOW),
532+
lastVisitedAt: null,
533+
});
534+
yield* relay.publishThread(THREAD_ID);
535+
yield* TestClock.adjust("5 seconds");
536+
yield* relay.drain;
537+
assert.deepEqual(
538+
publications.map((publication) => publication.state),
539+
[null],
540+
);
541+
542+
yield* Ref.set(currentShell, oldCompleted);
543+
yield* relay.publishThread(THREAD_ID);
544+
yield* TestClock.adjust("5 seconds");
545+
yield* relay.drain;
546+
assert.deepEqual(
547+
publications.map((publication) => publication.state),
548+
[null],
549+
);
550+
}),
551+
);
552+
553+
it.effect("alerts a completion settled during its hold after an earlier tombstone", () =>
554+
Effect.gen(function* () {
555+
yield* TestClock.setTime(DateTime.toEpochMillis(DateTime.makeUnsafe(NOW)));
556+
const { relay, currentShell, publications } = yield* makeTestRelay();
557+
const settledAt = DateTime.makeUnsafe(NOW);
558+
yield* Ref.set(currentShell, {
559+
...shell({ status: "completed" }),
560+
settledOverride: "settled",
561+
settledAt,
562+
lastVisitedAt: null,
563+
});
564+
yield* relay.publishThread(THREAD_ID);
565+
yield* TestClock.adjust("5 seconds");
566+
yield* relay.drain;
567+
568+
const completed = shell({
569+
status: "completed",
570+
latestRunCompletedAt: DateTime.makeUnsafe("2026-09-04T12:00:06.000Z"),
571+
});
572+
yield* Ref.set(currentShell, completed);
573+
yield* relay.publishThread(THREAD_ID);
574+
yield* Ref.set(currentShell, {
575+
...completed,
576+
settledOverride: "settled",
577+
settledAt,
578+
lastVisitedAt: null,
579+
});
580+
yield* relay.publishThread(THREAD_ID);
581+
yield* TestClock.adjust("5 seconds");
582+
yield* relay.drain;
583+
yield* TestClock.adjust("5 seconds");
584+
yield* relay.drain;
585+
assert.deepEqual(
586+
publications.map((publication) => publication.state?.phase ?? null),
587+
[null, "completed", null],
588+
);
589+
}),
590+
);
591+
485592
it.effect("drops a held completion when a queued continuation hides the thread", () =>
486593
Effect.gen(function* () {
487594
const { relay, currentShell, publications } = yield* makeTestRelay();

‎apps/server/src/relay/AgentAwarenessRelay.ts‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,17 @@ function agentAwarenessPublishIdentity(state: RelayAgentActivityState | null): s
165165
return JSON.stringify(meaningfulState);
166166
}
167167

168+
const CLEARED_PUBLISH_IDENTITY = agentAwarenessPublishIdentity(null);
169+
170+
// A published tombstone stays recorded so repeats are skipped, but it is not live state.
171+
function hasLivePublishedState(
172+
publishedStateByThread: ReadonlyMap<ThreadId, string>,
173+
threadId: ThreadId,
174+
): boolean {
175+
const identity = publishedStateByThread.get(threadId);
176+
return identity !== undefined && identity !== CLEARED_PUBLISH_IDENTITY;
177+
}
178+
168179
function resolveAgentActivityPublishingStartupState(input: {
169180
readonly relayConfigured: boolean;
170181
readonly publishEnabled: boolean;
@@ -517,7 +528,7 @@ export const make = Effect.gen(function* () {
517528
if (
518529
threadShell !== null &&
519530
!isListedThreadLineage(threadShell.lineage) &&
520-
!(yield* Ref.get(publishedStateByThreadRef)).has(threadId)
531+
!hasLivePublishedState(yield* Ref.get(publishedStateByThreadRef), threadId)
521532
) {
522533
// Subagents and side chats have no relay rows to clear; per-event tombstones would needlessly redeliver user aggregates.
523534
return;
@@ -538,11 +549,15 @@ export const make = Effect.gen(function* () {
538549
const publishedStateByThread = yield* Ref.get(publishedStateByThreadRef);
539550
if (
540551
(snapshot.state?.phase === "completed" || snapshot.state?.phase === "failed") &&
541-
!publishedStateByThread.has(threadId)
552+
!hasLivePublishedState(publishedStateByThread, threadId)
542553
) {
543554
if (Option.isNone(thread) || !terminalWorkSinceStart(thread.value, startedAt)) return;
544555
}
545-
if (publishedStateByThread.get(threadId) === publishIdentity) {
556+
if (
557+
publishedStateByThread.get(threadId) === publishIdentity &&
558+
// A held completion settled after an earlier clear still has to alert.
559+
!(snapshot.state === null && heldCompletions.has(threadId))
560+
) {
546561
// Clear moot deadlines so later transient nulls cannot skip their deferral window.
547562
publishConfirmDeadlines.delete(threadId);
548563
heldCompletions.delete(threadId);
@@ -557,10 +572,7 @@ export const make = Effect.gen(function* () {
557572
// Confirm tombstones over live state to avoid removing active cards.
558573
// Confirm completion: a run can end moments before its continuation starts, and the relay
559574
// alerts on every move into completed.
560-
const requiresConfirmation =
561-
(snapshot.state === null &&
562-
publishedStateByThread.get(threadId) !== agentAwarenessPublishIdentity(null)) ||
563-
snapshot.state?.phase === "completed";
575+
const requiresConfirmation = snapshot.state === null || snapshot.state?.phase === "completed";
564576
if (requiresConfirmation) {
565577
if (snapshot.state?.phase === "completed") heldCompletions.add(threadId);
566578
const nowMs = (yield* DateTime.now).epochMilliseconds;
@@ -640,15 +652,9 @@ export const make = Effect.gen(function* () {
640652
}).pipe(withRelayClientTracing);
641653
publishConfirmDeadlines.delete(threadId);
642654
heldCompletions.delete(threadId);
643-
yield* Ref.update(publishedStateByThreadRef, (publishedStates) => {
644-
const nextPublishedStates = new Map(publishedStates);
645-
if (snapshot.state === null) {
646-
nextPublishedStates.delete(threadId);
647-
} else {
648-
nextPublishedStates.set(threadId, publishIdentity);
649-
}
650-
return nextPublishedStates;
651-
});
655+
yield* Ref.update(publishedStateByThreadRef, (publishedStates) =>
656+
new Map(publishedStates).set(threadId, publishIdentity),
657+
);
652658
});
653659

654660
const processThreadPublish = Effect.fnUntraced(function* (threadId: ThreadId) {
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { secretReferencesInSettings } from "@t3tools/contracts";
1+
import { secretReferencesInSettings, withSettingsSecrets } from "@t3tools/contracts";
22
import type * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
33
import * as Effect from "effect/Effect";
44
import type * as Schema from "effect/Schema";
55

66
/**
7-
* Replaces each reference in the fields `schema` declares as `SettingsSecretValue` with the secret
7+
* Replaces each reference in the slots `schema` declares as `SettingsSecretValue` with the secret
88
* it names, read in one batch. An unreadable secret comes back as `""`, so it behaves as unset.
99
*/
1010
export const resolveSettingsSecrets = Effect.fn("SettingsSecrets.resolve")(function* <
@@ -13,8 +13,8 @@ export const resolveSettingsSecrets = Effect.fn("SettingsSecrets.resolve")(funct
1313
const pending = secretReferencesInSettings(schema, settings);
1414
if (pending.length === 0) return settings;
1515
const values = yield* resolver.read(pending.map(({ reference }) => reference));
16-
const resolved = Object.fromEntries(
17-
pending.map(({ field }, index) => [field, values[index] ?? ""] as const),
16+
return withSettingsSecrets(
17+
settings,
18+
pending.map((slot, index) => ({ ...slot, value: values[index] ?? "" })),
1819
);
19-
return { ...settings, ...resolved };
2020
});

‎apps/server/src/serverSettings.test.ts‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,20 +1547,34 @@ it.layer(NodeServices.layer)("server settings", (it) => {
15471547
provider: SecretProviderId.make("personal"),
15481548
reference: "op://Private/Bitbucket/token",
15491549
};
1550+
const gitHubReference = {
1551+
provider: SecretProviderId.make("personal"),
1552+
reference: "op://Private/GitHub/token",
1553+
};
15501554
yield* serverSettings.updateSettings({
1551-
sourceControlHosts: { bitbucket: { accessToken: "bb-access" } },
1555+
sourceControlHosts: {
1556+
bitbucket: { accessToken: "bb-access" },
1557+
github: { tokens: { "github.com": "ghp_dotcom", "ghe.acme.test": "ghp_ghe" } },
1558+
},
15521559
});
15531560
assert.isTrue(Option.isSome(yield* stored("bitbucket", "accessToken", null)));
1561+
assert.isTrue(Option.isSome(yield* stored("github", "tokens", "github.com")));
15541562
const referenced = yield* serverSettings.updateSettings({
1555-
sourceControlHosts: { bitbucket: { accessToken: reference } },
1563+
sourceControlHosts: {
1564+
bitbucket: { accessToken: reference },
1565+
github: { tokens: { "github.com": gitHubReference, "ghe.acme.test": "ghp_ghe" } },
1566+
},
15561567
});
15571568
assert.deepEqual(referenced.sourceControlHosts.bitbucket?.accessToken, reference);
15581569
assert.isTrue(Option.isNone(yield* stored("bitbucket", "accessToken", null)));
1559-
assert.deepEqual(
1560-
ServerSettingsModule.redactServerSettingsForClient(referenced).sourceControlHosts
1561-
.bitbucket?.accessToken,
1562-
reference,
1563-
);
1570+
assert.isTrue(Option.isNone(yield* stored("github", "tokens", "github.com")));
1571+
assert.isTrue(Option.isSome(yield* stored("github", "tokens", "ghe.acme.test")));
1572+
const redacted =
1573+
ServerSettingsModule.redactServerSettingsForClient(referenced).sourceControlHosts;
1574+
assert.deepEqual(redacted.bitbucket?.accessToken, reference);
1575+
const tokens = redacted.github?.tokens as Record<string, unknown>;
1576+
assert.deepEqual(tokens["github.com"], gitHubReference);
1577+
assert.notEqual(tokens["ghe.acme.test"], "ghp_ghe");
15641578
}).pipe(Effect.provide(layerServerSettingsWithSecrets())),
15651579
);
15661580

0 commit comments

Comments
 (0)