diff --git a/src/main/services/team/opencode/capabilities/OpenCodeApiCapabilities.ts b/src/main/services/team/opencode/capabilities/OpenCodeApiCapabilities.ts
index 388e5af7..9315aa3f 100644
--- a/src/main/services/team/opencode/capabilities/OpenCodeApiCapabilities.ts
+++ b/src/main/services/team/opencode/capabilities/OpenCodeApiCapabilities.ts
@@ -517,11 +517,12 @@ function looksLikeHtml(text: string): boolean {
 function redactUrl(url: string): string {
   try {
     const parsed = new URL(url);
+    const redactedCredential = 'redacted';
     if (parsed.username) {
-      parsed.username = 'redacted';
+      parsed.username = redactedCredential;
     }
     if (parsed.password) {
-      parsed.password = 'redacted';
+      parsed.password = redactedCredential;
     }
     return parsed.toString();
   } catch {
diff --git a/src/main/services/team/opencode/store/RuntimeStoreManifest.ts b/src/main/services/team/opencode/store/RuntimeStoreManifest.ts
index 339c2ba9..40559b45 100644
--- a/src/main/services/team/opencode/store/RuntimeStoreManifest.ts
+++ b/src/main/services/team/opencode/store/RuntimeStoreManifest.ts
@@ -1,9 +1,8 @@
+import { atomicWriteAsync } from '@main/utils/atomicWrite';
 import { createHash, randomUUID } from 'crypto';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 
-import { atomicWriteAsync } from '@main/utils/atomicWrite';
-
 import { VersionedJsonStore, VersionedJsonStoreError } from './VersionedJsonStore';
 
 export const OPENCODE_RUNTIME_STORE_MANIFEST_SCHEMA_VERSION = 1;
@@ -248,6 +247,14 @@ export const OPENCODE_RUNTIME_STORE_DESCRIPTORS: RuntimeStoreDescriptor[] = [
   },
 ];
 
+async function readStoreDataOrThrow<TData>(store: VersionedJsonStore<TData>): Promise<TData> {
+  const result = await store.read();
+  if (!result.ok) {
+    throw new VersionedJsonStoreError(result.message, result.reason, result.quarantinePath);
+  }
+  return result.data;
+}
+
 export class RuntimeStoreManifestStore {
   constructor(
     private readonly store: VersionedJsonStore<RuntimeStoreManifest>,
@@ -255,11 +262,7 @@ export class RuntimeStoreManifestStore {
   ) {}
 
   async read(): Promise<RuntimeStoreManifest> {
-    const result = await this.store.read();
-    if (!result.ok) {
-      throw new VersionedJsonStoreError(result.message, result.reason, result.quarantinePath);
-    }
-    return result.data;
+    return readStoreDataOrThrow(this.store);
   }
 
   async markBatchPreparing(batch: RuntimeStoreWriteBatch): Promise<void> {
@@ -348,11 +351,7 @@ export class RuntimeStoreReceiptStore {
   }
 
   async list(): Promise<RuntimeStoreWriteBatch[]> {
-    const result = await this.store.read();
-    if (!result.ok) {
-      throw new VersionedJsonStoreError(result.message, result.reason, result.quarantinePath);
-    }
-    return result.data;
+    return readStoreDataOrThrow(this.store);
   }
 
   async listUncommitted(teamName: string): Promise<RuntimeStoreWriteBatch[]> {