Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(release): pass native formatting and Linux speech tests

tianma-iff991e943fa43
diff --git a/apps/web/src/lib/transcribe-note-resource.test.mjs b/apps/web/src/lib/transcribe-note-resource.test.mjs
index 477630d4..b8cb5416 100644
--- a/apps/web/src/lib/transcribe-note-resource.test.mjs
+++ b/apps/web/src/lib/transcribe-note-resource.test.mjs
@@ -143,14 +143,18 @@ describe("client-side note media preparation", () => {
test("a browser transport failure does not claim the token or model is invalid", async () => {
async function* parts() { yield new File(["audio"], "sample.mp3", { type: "audio/mpeg" }); }
- await expect(transcribePreparedAudioParts(
- { baseUrl: "https://speech.example/v1", modelId: "whisper-1", apiKey: "test-token" },
- parts(),
- async () => { throw new TypeError("Failed to fetch"); },
- )).rejects.toMatchObject({
- code: "speech_provider_direct_unreachable",
- platform: "browser",
- });
+ try {
+ await transcribePreparedAudioParts(
+ { baseUrl: "https://speech.example/v1", modelId: "whisper-1", apiKey: "test-token" },
+ parts(),
+ async () => { throw new TypeError("Failed to fetch"); },
+ );
+ throw new Error("Expected a direct provider reachability error.");
+ } catch (error) {
+ expect(error).toBeInstanceOf(SpeechProviderReachabilityError);
+ expect(error.code).toBe("speech_provider_direct_unreachable");
+ expect(error.platform).toBe("browser");
+ }
expect(new SpeechProviderReachabilityError("browser").message).not.toMatch(/token|model/i);
});
diff --git a/crates/desktop-sidecar/src/main.rs b/crates/desktop-sidecar/src/main.rs
index f0dd7547..e1a64917 100644
--- a/crates/desktop-sidecar/src/main.rs
+++ b/crates/desktop-sidecar/src/main.rs
@@ -199,23 +199,31 @@ mod tests {
fn acknowledged_deletes_clear_only_older_conflicted_memo_edits() {
for (kind, entity_id, payload) in [
("memo.delete", "memo-a", json!({ "memoId": "memo-a" })),
- ("memo.deleteBatch", "batch", json!({ "memoIds": ["memo-a"] })),
+ (
+ "memo.deleteBatch",
+ "batch",
+ json!({ "memoIds": ["memo-a"] }),
+ ),
("memo.emptyTrash", "trash", json!({ "memoIds": ["memo-a"] })),
] {
let database = Connection::open_in_memory().unwrap();
- database.execute_batch(
- "CREATE TABLE _edgeever_sidecar_outbox (
+ database
+ .execute_batch(
+ "CREATE TABLE _edgeever_sidecar_outbox (
id INTEGER PRIMARY KEY, kind TEXT NOT NULL, entity_id TEXT NOT NULL,
payload_json TEXT NOT NULL, status TEXT NOT NULL, version INTEGER NOT NULL
);
INSERT INTO _edgeever_sidecar_outbox VALUES
(1, 'memo.update', 'memo-a', '{}', 'conflict', 1),
(2, 'memo.update', 'memo-b', '{}', 'conflict', 1);",
- ).unwrap();
- database.execute(
- "INSERT INTO _edgeever_sidecar_outbox VALUES (3, ?1, ?2, ?3, 'pending', 1)",
- rusqlite::params![kind, entity_id, payload.to_string()],
- ).unwrap();
+ )
+ .unwrap();
+ database
+ .execute(
+ "INSERT INTO _edgeever_sidecar_outbox VALUES (3, ?1, ?2, ?3, 'pending', 1)",
+ rusqlite::params![kind, entity_id, payload.to_string()],
+ )
+ .unwrap();
database.execute(
"INSERT INTO _edgeever_sidecar_outbox VALUES (4, 'memo.update', 'memo-a', '{}', 'conflict', 1)",
[],
@@ -223,18 +231,28 @@ mod tests {
let stale = sync_outbox_ack(&database, &json!({ "id": 3, "version": 0 })).unwrap();
assert_eq!(stale["superseded"], true);
- let count: i64 = database.query_row(
- "SELECT COUNT(*) FROM _edgeever_sidecar_outbox WHERE status = 'conflict'",
- [], |row| row.get(0),
- ).unwrap();
+ let count: i64 = database
+ .query_row(
+ "SELECT COUNT(*) FROM _edgeever_sidecar_outbox WHERE status = 'conflict'",
+ [],
+ |row| row.get(0),
+ )
+ .unwrap();
assert_eq!(count, 3, "stale acknowledgement must preserve drafts");
sync_outbox_ack(&database, &json!({ "id": 3, "version": 1 })).unwrap();
- let remaining: Vec<i64> = database.prepare(
- "SELECT id FROM _edgeever_sidecar_outbox ORDER BY id"
- ).unwrap().query_map([], |row| row.get(0)).unwrap()
- .collect::<Result<_, _>>().unwrap();
- assert_eq!(remaining, vec![2, 4], "{kind} must clear only the deleted memo's older conflict");
+ let remaining: Vec<i64> = database
+ .prepare("SELECT id FROM _edgeever_sidecar_outbox ORDER BY id")
+ .unwrap()
+ .query_map([], |row| row.get(0))
+ .unwrap()
+ .collect::<Result<_, _>>()
+ .unwrap();
+ assert_eq!(
+ remaining,
+ vec![2, 4],
+ "{kind} must clear only the deleted memo's older conflict"
+ );
}
}
diff --git a/crates/desktop-sidecar/src/memo.rs b/crates/desktop-sidecar/src/memo.rs
index 255b4bc5..17dbb3f5 100644
--- a/crates/desktop-sidecar/src/memo.rs
+++ b/crates/desktop-sidecar/src/memo.rs
@@ -240,7 +240,12 @@ pub(crate) fn empty_trash(database: &Connection) -> Result<Value, String> {
.execute("DELETE FROM memos WHERE is_deleted = 1", [])
.map_err(|e| e.to_string())?;
tx.commit().map_err(|e| e.to_string())?;
- enqueue_change(database, "memo.emptyTrash", "trash", &json!({ "memoIds": memo_ids }))?;
+ enqueue_change(
+ database,
+ "memo.emptyTrash",
+ "trash",
+ &json!({ "memoIds": memo_ids }),
+ )?;
Ok(json!({ "ok": true, "deleted": deleted }))
}
diff --git a/crates/desktop-sidecar/src/sync.rs b/crates/desktop-sidecar/src/sync.rs
index 345a6fd1..eb8ff89d 100644
--- a/crates/desktop-sidecar/src/sync.rs
+++ b/crates/desktop-sidecar/src/sync.rs
@@ -451,23 +451,28 @@ pub(crate) fn sync_outbox_ack(database: &Connection, params: &Value) -> Result<V
.unchecked_transaction()
.map_err(|e| e.to_string())?;
let deleted = if let Some(version) = requested_version {
- tx
- .execute(
- "DELETE FROM _edgeever_sidecar_outbox WHERE id = ?1 AND version = ?2",
- rusqlite::params![id, version],
- )
- .map_err(|e| e.to_string())?
+ tx.execute(
+ "DELETE FROM _edgeever_sidecar_outbox WHERE id = ?1 AND version = ?2",
+ rusqlite::params![id, version],
+ )
+ .map_err(|e| e.to_string())?
} else {
- tx
- .execute("DELETE FROM _edgeever_sidecar_outbox WHERE id = ?1", [id])
+ tx.execute("DELETE FROM _edgeever_sidecar_outbox WHERE id = ?1", [id])
.map_err(|e| e.to_string())?
};
- if deleted == 1 && matches!(kind.as_str(), "memo.delete" | "memo.deleteBatch" | "memo.emptyTrash") {
+ if deleted == 1
+ && matches!(
+ kind.as_str(),
+ "memo.delete" | "memo.deleteBatch" | "memo.emptyTrash"
+ )
+ {
let payload: Value = serde_json::from_str(&payload_json).unwrap_or_else(|_| json!({}));
let memo_ids: Vec<&str> = if kind == "memo.delete" {
vec![entity_id.as_str()]
} else {
- payload.get("memoIds").and_then(Value::as_array)
+ payload
+ .get("memoIds")
+ .and_then(Value::as_array)
.map(|ids| ids.iter().filter_map(Value::as_str).collect())
.unwrap_or_default()
};