diff --git a/packages/app/e2e/helpers/workspace-setup.ts b/packages/app/e2e/helpers/workspace-setup.ts
index cefb34298..3ab7bc6a3 100644
--- a/packages/app/e2e/helpers/workspace-setup.ts
+++ b/packages/app/e2e/helpers/workspace-setup.ts
@@ -45,7 +45,7 @@ interface WorkspaceSetupDaemonClient {
   }>;
   fetchAgent(agentId: string): Promise<{
     agent: { id: string; cwd: string } | null;
-    project: unknown | null;
+    project: unknown;
   } | null>;
   listTerminals(cwd: string): Promise<{
     cwd?: string;
diff --git a/packages/app/src/attachments/web/indexeddb-attachment-store.test.ts b/packages/app/src/attachments/web/indexeddb-attachment-store.test.ts
index 9957241b4..fb02eb878 100644
--- a/packages/app/src/attachments/web/indexeddb-attachment-store.test.ts
+++ b/packages/app/src/attachments/web/indexeddb-attachment-store.test.ts
@@ -3,8 +3,8 @@ import { createIndexedDbAttachmentStore } from "./indexeddb-attachment-store";
 
 type Listener = () => void;
 
-class FakeRequest<T = unknown> {
-  result!: T;
+class FakeRequest {
+  result!: unknown;
   error: Error | null = null;
   private listeners = new Map<string, Listener[]>();
 
@@ -70,7 +70,7 @@ describe("indexeddb attachment store", () => {
           const store = new FakeObjectStore((record) => {
             storedRecord = record;
           });
-          const request = new FakeRequest<FakeDatabase>();
+          const request = new FakeRequest();
           request.result = new FakeDatabase(store);
           queueMicrotask(() => request.emit("success"));
           return request;
diff --git a/packages/app/src/hooks/use-archive-agent.ts b/packages/app/src/hooks/use-archive-agent.ts
index 79ba980be..30a959130 100644
--- a/packages/app/src/hooks/use-archive-agent.ts
+++ b/packages/app/src/hooks/use-archive-agent.ts
@@ -230,10 +230,10 @@ function getArchivedAgentListCacheSnapshot(
   };
 }
 
-function restoreCachedQuerySnapshot<T>(
+function restoreCachedQuerySnapshot(
   queryClient: QueryClient,
   queryKey: readonly unknown[],
-  snapshot: T | undefined,
+  snapshot: unknown,
 ): void {
   if (snapshot === undefined) {
     queryClient.removeQueries({ queryKey, exact: true });
diff --git a/packages/app/src/hooks/use-image-attachment-picker.ts b/packages/app/src/hooks/use-image-attachment-picker.ts
index 6808acae6..a8b428c1e 100644
--- a/packages/app/src/hooks/use-image-attachment-picker.ts
+++ b/packages/app/src/hooks/use-image-attachment-picker.ts
@@ -20,7 +20,10 @@ export function useImageAttachmentPicker(): UseImageAttachmentPickerResult {
   const ensurePermission = useCallback(async () => {
     let currentPermission = mediaPermission;
 
-    if (!currentPermission || currentPermission.status === "undetermined") {
+    if (
+      !currentPermission ||
+      currentPermission.status === ImagePicker.PermissionStatus.UNDETERMINED
+    ) {
       currentPermission = await requestMediaPermission();
     } else if (!currentPermission.granted) {
       currentPermission = await requestMediaPermission();
diff --git a/packages/app/src/hooks/use-push-token-registration.ts b/packages/app/src/hooks/use-push-token-registration.ts
index 78271cfdc..a100bc48c 100644
--- a/packages/app/src/hooks/use-push-token-registration.ts
+++ b/packages/app/src/hooks/use-push-token-registration.ts
@@ -24,10 +24,10 @@ function getExpoProjectId(): string | null {
 
 async function ensurePushPermission(): Promise<boolean> {
   const existing = await Notifications.getPermissionsAsync();
-  if (existing.status === "granted") return true;
+  if (existing.status === Notifications.PermissionStatus.GRANTED) return true;
   if (!existing.canAskAgain) return false;
   const requested = await Notifications.requestPermissionsAsync();
-  return requested.status === "granted";
+  return requested.status === Notifications.PermissionStatus.GRANTED;
 }
 
 export function usePushTokenRegistration(params: { client: DaemonClient; serverId: string }): void {
diff --git a/packages/app/src/screens/workspace/workspace-draft-agent-tab.tsx b/packages/app/src/screens/workspace/workspace-draft-agent-tab.tsx
index 550f18521..026f1437d 100644
--- a/packages/app/src/screens/workspace/workspace-draft-agent-tab.tsx
+++ b/packages/app/src/screens/workspace/workspace-draft-agent-tab.tsx
@@ -22,7 +22,7 @@ import { shouldAutoFocusWorkspaceDraftComposer } from "@/screens/workspace/works
 import type { AgentCapabilityFlags } from "@server/server/agent/agent-sdk-types";
 import type { AgentSnapshotPayload } from "@server/shared/messages";
 import type { DaemonClient } from "@server/client/daemon-client";
-import type { ComposerAttachment, WorkspaceComposerAttachment } from "@/attachments/types";
+import type { WorkspaceComposerAttachment } from "@/attachments/types";
 import {
   useWorkspaceAttachments,
   useWorkspaceAttachmentScopeKey,
@@ -147,7 +147,7 @@ async function submitDraftCreateRequest(input: {
   attempt: { clientMessageId: string };
   text: string;
   images?: UserMessageImageAttachment[];
-  attachments?: ComposerAttachment[] | unknown;
+  attachments?: unknown;
   client: DaemonClient | null;
   workspaceDirectory: string | null;
   workspaceExecutionAuthority: { workspaceId: string } | null;
diff --git a/packages/app/src/types/stream.test.ts b/packages/app/src/types/stream.test.ts
index 48d12b28e..e9d3bcf91 100644
--- a/packages/app/src/types/stream.test.ts
+++ b/packages/app/src/types/stream.test.ts
@@ -42,8 +42,8 @@ function canonicalToolTimeline(params: {
   callId: string;
   name: string;
   status: CanonicalToolStatus;
-  input?: unknown | null;
-  output?: unknown | null;
+  input?: unknown;
+  output?: unknown;
   error?: unknown;
   metadata?: Record<string, unknown>;
   detail?: ToolCallDetail;
diff --git a/packages/app/src/utils/tool-call-detail-state.ts b/packages/app/src/utils/tool-call-detail-state.ts
index 5be0ee82d..266095af9 100644
--- a/packages/app/src/utils/tool-call-detail-state.ts
+++ b/packages/app/src/utils/tool-call-detail-state.ts
@@ -96,7 +96,7 @@ export function hasMeaningfulToolCallDetail(detail: ToolCallDetail | undefined):
 export function isPendingToolCallDetail(params: {
   detail: ToolCallDetail | undefined;
   status: "executing" | "running" | "completed" | "failed" | "canceled";
-  error: unknown | null | undefined;
+  error: unknown;
 }): boolean {
   const isRunning = params.status === "running" || params.status === "executing";
   return isRunning && params.error == null && !hasMeaningfulToolCallDetail(params.detail);
diff --git a/packages/desktop/src/settings/desktop-settings-commands.ts b/packages/desktop/src/settings/desktop-settings-commands.ts
index fd1215c4f..c6f293a5a 100644
--- a/packages/desktop/src/settings/desktop-settings-commands.ts
+++ b/packages/desktop/src/settings/desktop-settings-commands.ts
@@ -1,6 +1,6 @@
 import type { DesktopSettingsStore } from "./desktop-settings.js";
 
-export type DesktopCommandHandler = (args?: Record<string, unknown>) => Promise<unknown> | unknown;
+export type DesktopCommandHandler = (args?: Record<string, unknown>) => unknown;
 
 export function createDesktopSettingsCommandHandlers({
   settingsStore,
diff --git a/packages/server/src/server/agent/agent-stream-coalescer.test.ts b/packages/server/src/server/agent/agent-stream-coalescer.test.ts
index 3e409ccf4..0983712e2 100644
--- a/packages/server/src/server/agent/agent-stream-coalescer.test.ts
+++ b/packages/server/src/server/agent/agent-stream-coalescer.test.ts
@@ -481,13 +481,11 @@ describe("AgentStreamCoalescer", () => {
   test("stale timers cannot flush reused agent ids", () => {
     const scheduled: Array<() => void> = [];
     const flushes: AgentStreamCoalescerFlush[] = [];
-    const setTimeoutShim: AgentStreamCoalescerTimers["setTimeout"] = (callback, delay, ...args) => {
-      if (typeof callback === "function") {
-        scheduled.push(() => {
-          callback(...args);
-        });
-      }
-      return setTimeout(callback, delay, ...args);
+    const setTimeoutShim: AgentStreamCoalescerTimers["setTimeout"] = (callback, delay) => {
+      scheduled.push(() => {
+        callback();
+      });
+      return setTimeout(callback, delay);
     };
     const coalescer = new AgentStreamCoalescer({
       timers: {
diff --git a/packages/server/src/server/agent/agent-stream-coalescer.ts b/packages/server/src/server/agent/agent-stream-coalescer.ts
index 88ba74051..3f179d58c 100644
--- a/packages/server/src/server/agent/agent-stream-coalescer.ts
+++ b/packages/server/src/server/agent/agent-stream-coalescer.ts
@@ -11,7 +11,7 @@ type CoalescableTimelineEvent = Extract<AgentStreamEvent, { type: "timeline" }>
 };
 
 export interface AgentStreamCoalescerTimers {
-  setTimeout: typeof setTimeout;
+  setTimeout: (callback: () => void, ms?: number) => ReturnType<typeof setTimeout>;
   clearTimeout: typeof clearTimeout;
 }
 
diff --git a/packages/server/src/server/test-utils/class-mocks.ts b/packages/server/src/server/test-utils/class-mocks.ts
index c03ffef20..c3073a6aa 100644
--- a/packages/server/src/server/test-utils/class-mocks.ts
+++ b/packages/server/src/server/test-utils/class-mocks.ts
@@ -37,7 +37,7 @@ export function createStub<T extends object>(stubs: { [K in keyof T]?: unknown }
       if (Reflect.has(target, prop)) return Reflect.get(target, prop, receiver);
       if (typeof prop === "symbol") return undefined;
       return (..._args: unknown[]): never => {
-        throw new Error(`createStub: "${String(prop)}" was called but not stubbed`);
+        throw new Error(`createStub: "${prop}" was called but not stubbed`);
       };
     },
   }) as unknown as T; // one justified cast — rationale in file-level comment
@@ -52,6 +52,6 @@ export function createStub<T extends object>(stubs: { [K in keyof T]?: unknown }
  * assertion — narrowing from the top type is safe, unlike `as unknown as T`
  * which short-circuits structural checking on a concrete source type.
  */
-export function asInternals<T>(obj: unknown): T {
+export function asInternals<T>(obj: T extends object ? unknown : unknown): T {
   return obj as T;
 }
diff --git a/packages/server/src/server/workspace-registry-model.ts b/packages/server/src/server/workspace-registry-model.ts
index daf655c77..9cb188ee5 100644
--- a/packages/server/src/server/workspace-registry-model.ts
+++ b/packages/server/src/server/workspace-registry-model.ts
@@ -110,7 +110,7 @@ export function deriveProjectGroupingName(projectKey: string): string {
       return pathSegments.slice(-2).join("/");
     }
     if (pathSegments.length === 1) {
-      return pathSegments[0]!;
+      return pathSegments[0];
     }
     return projectKey;
   }