Fixes

Author: MelbourneDeveloper

coverage-thresholds.json

@@ -1,6 +1,6 @@
 {
-  "lines": 83.12,
-  "functions": 81.41,
-  "branches": 76.02,
-  "statements": 83.12
+  "lines": 83,
+  "functions": 80.81,
+  "branches": 76.9,
+  "statements": 83
 }

src/CommandTreeProvider.ts

@@ -9,7 +9,7 @@ import { buildNestedFolderItems } from "./tree/folderTree";
 import { createCommandNode, createCategoryNode } from "./tree/nodeFactory";
 import { getAllRows } from "./db/db";
 import type { CommandRow } from "./db/db";
-import { getDb } from "./db/lifecycle";
+import { getDbOrThrow } from "./db/lifecycle";
 
 type SortOrder = "folder" | "name" | "type";
 
@@ -49,11 +49,8 @@ export class CommandTreeProvider implements vscode.TreeDataProvider<CommandTreeI
   }
 
   private loadSummaries(): void {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return;
-    }
-    const rows = getAllRows(dbResult.value);
+    const handle = getDbOrThrow();
+    const rows = getAllRows(handle);
     const map = new Map<string, CommandRow>();
     for (const row of rows) {
       map.set(row.commandId, row);

src/QuickTasksProvider.ts

@@ -8,7 +8,7 @@ import * as vscode from "vscode";
 import type { CommandItem, CommandTreeItem } from "./models/TaskItem";
 import { isCommandItem } from "./models/TaskItem";
 import { TagConfig } from "./config/TagConfig";
-import { getDb } from "./db/lifecycle";
+import { getDbOrThrow } from "./db/lifecycle";
 import { getCommandIdsByTag, reorderTagCommands } from "./db/db";
 import { createCommandNode, createPlaceholderNode } from "./tree/nodeFactory";
 
@@ -104,11 +104,8 @@ export class QuickTasksProvider
    * Sorts tasks by display_order from junction table.
    */
   private sortByDisplayOrder(tasks: CommandItem[]): CommandItem[] {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return tasks.sort((a, b) => a.label.localeCompare(b.label));
-    }
-    const orderedIds = getCommandIdsByTag({ handle: dbResult.value, tagName: QUICK_TAG });
+    const handle = getDbOrThrow();
+    const orderedIds = getCommandIdsByTag({ handle, tagName: QUICK_TAG });
     return [...tasks].sort((a, b) => {
       const indexA = orderedIds.indexOf(a.id);
       const indexB = orderedIds.indexOf(b.id);
@@ -147,10 +144,6 @@ export class QuickTasksProvider
     }
 
     const orderedIds = this.fetchOrderedQuickIds();
-    if (orderedIds === undefined) {
-      return;
-    }
-
     const reordered = this.computeReorder({ orderedIds, draggedTask, target });
     if (reordered === undefined) {
       return;
@@ -163,12 +156,9 @@ export class QuickTasksProvider
   /**
    * Fetches ordered command IDs for the quick tag from the DB.
    */
-  private fetchOrderedQuickIds(): string[] | undefined {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return undefined;
-    }
-    return getCommandIdsByTag({ handle: dbResult.value, tagName: QUICK_TAG });
+  private fetchOrderedQuickIds(): string[] {
+    const handle = getDbOrThrow();
+    return getCommandIdsByTag({ handle, tagName: QUICK_TAG });
   }
 
   /**
@@ -205,11 +195,8 @@ export class QuickTasksProvider
    * Persists display_order for each command in the reordered list.
    */
   private persistDisplayOrder(reordered: string[]): void {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return;
-    }
-    reorderTagCommands({ handle: dbResult.value, tagName: QUICK_TAG, orderedCommandIds: reordered });
+    const handle = getDbOrThrow();
+    reorderTagCommands({ handle, tagName: QUICK_TAG, orderedCommandIds: reordered });
   }
 
   /**

src/config/TagConfig.ts

@@ -5,7 +5,7 @@
  */
 
 import type { CommandItem } from "../models/TaskItem";
-import { getDb } from "../db/lifecycle";
+import { getDbOrThrow } from "../db/lifecycle";
 import {
   addTagToCommand,
   removeTagFromCommand,
@@ -22,16 +22,12 @@ export class TagConfig {
    * Loads all tag assignments from SQLite junction table.
    */
   public load(): void {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      this.commandTagsMap = new Map();
-      return;
-    }
+    const handle = getDbOrThrow();
 
-    const tagNames = getAllTagNames(dbResult.value);
+    const tagNames = getAllTagNames(handle);
     const map = new Map<string, string[]>();
     for (const tagName of tagNames) {
-      const commandIds = getCommandIdsByTag({ handle: dbResult.value, tagName });
+      const commandIds = getCommandIdsByTag({ handle, tagName });
       for (const commandId of commandIds) {
         const tags = map.get(commandId) ?? [];
         tags.push(tagName);
@@ -57,23 +53,17 @@ export class TagConfig {
    * Gets all tag names.
    */
   public getTagNames(): string[] {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return [];
-    }
-    return getAllTagNames(dbResult.value);
+    const handle = getDbOrThrow();
+    return getAllTagNames(handle);
   }
 
   /**
    * SPEC: tagging/management
    * Adds a task to a tag by creating junction record with exact command ID.
    */
   public addTaskToTag(task: CommandItem, tagName: string): void {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return;
-    }
-    addTagToCommand({ handle: dbResult.value, commandId: task.id, tagName });
+    const handle = getDbOrThrow();
+    addTagToCommand({ handle, commandId: task.id, tagName });
     this.load();
   }
 
@@ -82,11 +72,8 @@ export class TagConfig {
    * Removes a task from a tag by deleting junction record.
    */
   public removeTaskFromTag(task: CommandItem, tagName: string): void {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return;
-    }
-    removeTagFromCommand({ handle: dbResult.value, commandId: task.id, tagName });
+    const handle = getDbOrThrow();
+    removeTagFromCommand({ handle, commandId: task.id, tagName });
     this.load();
   }
 
@@ -95,23 +82,17 @@ export class TagConfig {
    * Gets ordered command IDs for a tag (ordered by display_order).
    */
   public getOrderedCommandIds(tagName: string): string[] {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return [];
-    }
-    return getCommandIdsByTag({ handle: dbResult.value, tagName });
+    const handle = getDbOrThrow();
+    return getCommandIdsByTag({ handle, tagName });
   }
 
   /**
    * SPEC: quick-launch
    * Reorders commands for a tag by updating display_order in junction table.
    */
   public reorderCommands(tagName: string, orderedCommandIds: string[]): void {
-    const dbResult = getDb();
-    if (!dbResult.ok) {
-      return;
-    }
-    reorderTagCommands({ handle: dbResult.value, tagName, orderedCommandIds });
+    const handle = getDbOrThrow();
+    reorderTagCommands({ handle, tagName, orderedCommandIds });
     this.load();
   }
 }

src/discovery/ant.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import type { CommandItem, IconDef, CategoryDef } from "../models/TaskItem";
 import { generateCommandId, simplifyPath } from "../models/TaskItem";
-import { readFile } from "../utils/fileUtils";
+import { readFileContent } from "../utils/fileUtils";
 
 export const ICON_DEF: IconDef = {
   icon: "symbol-constructor",
@@ -27,12 +27,7 @@ export async function discoverAntTargets(workspaceRoot: string, excludePatterns:
   const commands: CommandItem[] = [];
 
   for (const file of files) {
-    const result = await readFile(file);
-    if (!result.ok) {
-      continue; // Skip files we can't read
-    }
-
-    const content = result.value;
+    const content = await readFileContent(file);
     const antDir = path.dirname(file.fsPath);
     const category = simplifyPath(file.fsPath, workspaceRoot);
     const targets = parseAntTargets(content);

src/discovery/cargo.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import type { CommandItem, IconDef, CategoryDef } from "../models/TaskItem";
 import { generateCommandId, simplifyPath } from "../models/TaskItem";
-import { readFile } from "../utils/fileUtils";
+import { readFileContent } from "../utils/fileUtils";
 
 export const ICON_DEF: IconDef = { icon: "package", color: "terminal.ansiRed" };
 export const CATEGORY_DEF: CategoryDef = {
@@ -41,12 +41,7 @@ export async function discoverCargoTasks(workspaceRoot: string, excludePatterns:
   const commands: CommandItem[] = [];
 
   for (const file of files) {
-    const result = await readFile(file);
-    if (!result.ok) {
-      continue; // Skip files we can't read
-    }
-
-    const content = result.value;
+    const content = await readFileContent(file);
     const cargoDir = path.dirname(file.fsPath);
     const category = simplifyPath(file.fsPath, workspaceRoot);
 

src/discovery/composer.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import type { CommandItem, MutableCommandItem, IconDef, CategoryDef } from "../models/TaskItem";
 import { generateCommandId, simplifyPath } from "../models/TaskItem";
-import { readFile, parseJson } from "../utils/fileUtils";
+import { readFileContent } from "../utils/fileUtils";
 
 export const ICON_DEF: IconDef = {
   icon: "symbol-interface",
@@ -70,17 +70,8 @@ function buildCommandItem(params: BuildCommandItemParams): CommandItem {
 }
 
 async function extractScriptsFromFile(file: vscode.Uri, workspaceRoot: string): Promise<CommandItem[]> {
-  const contentResult = await readFile(file);
-  if (!contentResult.ok) {
-    return [];
-  }
-
-  const composerResult = parseJson<ComposerJson>(contentResult.value);
-  if (!composerResult.ok) {
-    return [];
-  }
-
-  const composer = composerResult.value;
+  const content = await readFileContent(file);
+  const composer = JSON.parse(content) as ComposerJson;
   if (composer.scripts === undefined || typeof composer.scripts !== "object") {
     return [];
   }

src/discovery/csharp-script.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import type { CommandItem, MutableCommandItem, IconDef, CategoryDef } from "../models/TaskItem";
 import { generateCommandId, simplifyPath } from "../models/TaskItem";
-import { readFile, parseFirstLineComment } from "../utils/fileUtils";
+import { readFileContent, parseFirstLineComment } from "../utils/fileUtils";
 
 export const ICON_DEF: IconDef = {
   icon: "file-code",
@@ -28,13 +28,9 @@ export async function discoverCsharpScripts(workspaceRoot: string, excludePatter
   const commands: CommandItem[] = [];
 
   for (const file of files) {
-    const result = await readFile(file);
-    if (!result.ok) {
-      continue;
-    }
-
+    const content = await readFileContent(file);
     const name = path.basename(file.fsPath);
-    const description = parseFirstLineComment(result.value, COMMENT_PREFIX);
+    const description = parseFirstLineComment(content, COMMENT_PREFIX);
 
     const task: MutableCommandItem = {
       id: generateCommandId("csharp-script", file.fsPath, name),

src/discovery/deno.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import type { CommandItem, MutableCommandItem, IconDef, CategoryDef } from "../models/TaskItem";
 import { generateCommandId, simplifyPath } from "../models/TaskItem";
-import { readFile, parseJson, removeJsonComments } from "../utils/fileUtils";
+import { readFileContent, removeJsonComments } from "../utils/fileUtils";
 
 export const ICON_DEF: IconDef = {
   icon: "symbol-namespace",
@@ -39,19 +39,9 @@ export async function discoverDenoTasks(workspaceRoot: string, excludePatterns:
   const commands: CommandItem[] = [];
 
   for (const file of allFiles) {
-    const contentResult = await readFile(file);
-    if (!contentResult.ok) {
-      continue; // Skip unreadable files
-    }
-
-    // Remove JSONC comments
-    const cleanJson = removeJsonComments(contentResult.value);
-    const denoResult = parseJson<DenoJson>(cleanJson);
-    if (!denoResult.ok) {
-      continue; // Skip malformed deno.json
-    }
-
-    const deno = denoResult.value;
+    const content = await readFileContent(file);
+    const cleanJson = removeJsonComments(content);
+    const deno = JSON.parse(cleanJson) as DenoJson;
     if (deno.tasks === undefined || typeof deno.tasks !== "object") {
       continue;
     }

src/discovery/docker.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import type { CommandItem, MutableCommandItem, IconDef, CategoryDef } from "../models/TaskItem";
 import { generateCommandId, simplifyPath } from "../models/TaskItem";
-import { readFile } from "../utils/fileUtils";
+import { readFileContent } from "../utils/fileUtils";
 
 export const ICON_DEF: IconDef = {
   icon: "server-environment",
@@ -31,12 +31,7 @@ export async function discoverDockerComposeServices(
   const commands: CommandItem[] = [];
 
   for (const file of allFiles) {
-    const result = await readFile(file);
-    if (!result.ok) {
-      continue; // Skip files we can't read
-    }
-
-    const content = result.value;
+    const content = await readFileContent(file);
     const dockerDir = path.dirname(file.fsPath);
     const category = simplifyPath(file.fsPath, workspaceRoot);
     const services = parseDockerComposeServices(content);