Compare commits

..

2 Commits

Author SHA1 Message Date
0a7c24da4e llm-agents.nix: change was upstreamed
Some checks failed
Build and Deploy / deploy (push) Failing after 13m45s
2026-04-08 18:12:21 -04:00
27096b17be a 2026-04-08 18:11:37 -04:00
3 changed files with 18 additions and 36 deletions

41
flake.lock generated
View File

@@ -404,21 +404,19 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay",
"systems": "systems_3", "systems": "systems_3",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1775663139, "lastModified": 1775686143,
"narHash": "sha256-mFmUbE2OLNl0YA1RACprVObeBjK8Qv9aV/V6fmn3mUU=", "narHash": "sha256-i1hPhsXzqxDm3AozQaBWjjEyeY0WjEetLxJQTKO3cmM=",
"owner": "titaniumtown", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "a507240bd404b28dbfc7e8d98bdf6c265e2ad51a", "rev": "64bb5ca22da91a804fe559dbc04a7b3fe6711555",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "titaniumtown", "owner": "numtide",
"ref": "pr/omp-build-from-source",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"type": "github" "type": "github"
} }
@@ -662,32 +660,11 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"noctalia": "noctalia", "noctalia": "noctalia",
"rust-overlay": "rust-overlay_2", "rust-overlay": "rust-overlay",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": {
"nixpkgs": [
"llm-agents",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775617983,
"narHash": "sha256-2NWGA/I4j/qlx6qbg86QvJiK1/GyH9gnf0hFiARWVwE=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d98b91b1feae7ef07fa2ccb3aa3f83f11abfae54",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@@ -790,11 +767,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775125835, "lastModified": 1775636079,
"narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "75925962939880974e3ab417879daffcba36c4a3", "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -80,7 +80,7 @@
}; };
llm-agents = { llm-agents = {
url = "github:titaniumtown/llm-agents.nix/pr/omp-build-from-source"; url = "github:numtide/llm-agents.nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@@ -1,4 +1,4 @@
commit 31d537735d3c5e25a2b620d63ebbfea4cf84f57e commit 02b80dd74e2f962fffc9b0076bb7966eea4e45ff
Author: Simon Gardling <titaniumtown@proton.me> Author: Simon Gardling <titaniumtown@proton.me>
Date: Wed Apr 8 13:05:09 2026 -0400 Date: Wed Apr 8 13:05:09 2026 -0400
@@ -20,10 +20,10 @@ index 3f50b7bd4..248dacbff 100644
### Fixed ### Fixed
diff --git a/packages/ai/src/auth-storage.ts b/packages/ai/src/auth-storage.ts diff --git a/packages/ai/src/auth-storage.ts b/packages/ai/src/auth-storage.ts
index 9fdb4473b..fac936dad 100644 index 9fdb4473b..fc81a6f3b 100644
--- a/packages/ai/src/auth-storage.ts --- a/packages/ai/src/auth-storage.ts
+++ b/packages/ai/src/auth-storage.ts +++ b/packages/ai/src/auth-storage.ts
@@ -1865,7 +1865,30 @@ export class AuthStorage { @@ -1865,7 +1865,35 @@ export class AuthStorage {
}); });
if (isDefinitiveFailure) { if (isDefinitiveFailure) {
@@ -44,6 +44,11 @@ index 9fdb4473b..fac936dad 100644
+ ) { + ) {
+ // DB has a newer refresh token — another instance refreshed. + // DB has a newer refresh token — another instance refreshed.
+ // Update in-memory state and retry with the fresh credential. + // Update in-memory state and retry with the fresh credential.
+ logger.warn("Concurrent refresh detected, syncing from DB and retrying", {
+ provider,
+ index: selection.index,
+ rowId: entry.id,
+ });
+ const updated = [...entries]; + const updated = [...entries];
+ updated[selection.index] = { id: entry.id, credential: dbEntry.credential }; + updated[selection.index] = { id: entry.id, credential: dbEntry.credential };
+ this.#setStoredCredentials(provider, updated); + this.#setStoredCredentials(provider, updated);