Fixes

Author: MelbourneDeveloper

.vscode-test.mjs

@@ -1,49 +1,50 @@
-import { defineConfig } from '@vscode/test-cli';
-import { cpSync, mkdtempSync } from 'fs';
-import { tmpdir } from 'os';
-import { join, resolve } from 'path';
-import { fileURLToPath } from 'url';
-import { dirname } from 'path';
+import { defineConfig } from "@vscode/test-cli";
+import { cpSync, mkdtempSync } from "fs";
+import { tmpdir } from "os";
+import { join, resolve } from "path";
+import { fileURLToPath } from "url";
+import { dirname } from "path";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Copy fixtures to a temp directory so tests run in full isolation
-const testWorkspace = mkdtempSync(join(tmpdir(), 'commandtree-test-'));
-cpSync('./src/test/fixtures/workspace', testWorkspace, { recursive: true });
+const testWorkspace = mkdtempSync(join(tmpdir(), "commandtree-test-"));
+cpSync("./src/test/fixtures/workspace", testWorkspace, { recursive: true });
 
-const userDataDir = resolve(__dirname, '.vscode-test/user-data');
+const userDataDir = resolve(__dirname, ".vscode-test/user-data");
 
 export default defineConfig({
-    tests: [{
-        files: ['out/test/e2e/**/*.test.js', 'out/test/providers/**/*.test.js', 'out/test/unit/**/*.test.js'],
-        version: 'stable',
-        workspaceFolder: testWorkspace,
-        extensionDevelopmentPath: './',
-        srcDir: __dirname,
-        mocha: {
-            ui: 'tdd',
-            timeout: 60000,
-            color: true,
-            slow: 10000
-        },
-        launchArgs: [
-            '--user-data-dir', userDataDir
-        ]
-    }],
-    coverage: {
-        includeAll: true,
-        // @vscode/test-cli sets report.exclude.relativePath = false, which
-        // makes test-exclude match against absolute paths. Patterns must
-        // start with **/ so minimatch can match any prefix.
-        include: ['**/out/**/*.js'],
-        exclude: [
-            '**/out/test/**',
-            '**/out/semantic/summariser.js',       // requires Copilot auth, not available in CI
-            '**/out/semantic/summaryPipeline.js',   // requires Copilot auth, not available in CI
-            '**/out/semantic/vscodeAdapters.js',    // requires Copilot auth, not available in CI
-            '**/out/semantic/adapters.js',          // type-only interfaces, no runtime behavior
-        ],
-        reporter: ['text', 'lcov', 'html', 'json-summary'],
-        output: './coverage'
-    }
+  tests: [
+    {
+      files: ["out/test/e2e/**/*.test.js", "out/test/providers/**/*.test.js", "out/test/unit/**/*.test.js"],
+      version: "stable",
+      workspaceFolder: testWorkspace,
+      extensionDevelopmentPath: "./",
+      srcDir: __dirname,
+      mocha: {
+        ui: "tdd",
+        bail: true,
+        timeout: 60000,
+        color: true,
+        slow: 10000,
+      },
+      launchArgs: ["--user-data-dir", userDataDir],
+    },
+  ],
+  coverage: {
+    includeAll: true,
+    // @vscode/test-cli sets report.exclude.relativePath = false, which
+    // makes test-exclude match against absolute paths. Patterns must
+    // start with **/ so minimatch can match any prefix.
+    include: ["**/out/**/*.js"],
+    exclude: [
+      "**/out/test/**",
+      "**/out/semantic/summariser.js", // requires Copilot auth, not available in CI
+      "**/out/semantic/summaryPipeline.js", // requires Copilot auth, not available in CI
+      "**/out/semantic/vscodeAdapters.js", // requires Copilot auth, not available in CI
+      "**/out/semantic/adapters.js", // type-only interfaces, no runtime behavior
+    ],
+    reporter: ["text", "lcov", "html", "json-summary"],
+    output: "./coverage",
+  },
 });

Makefile

@@ -34,13 +34,10 @@ endif
 COVERAGE_THRESHOLDS_FILE := coverage-thresholds.json
 
 UNAME := $(shell uname 2>/dev/null)
-VSCODE_TEST_CMD = npx vscode-test --coverage
-VSCODE_TEST_EXCLUDE_CMD = npx vscode-test --coverage --grep @exclude-ci --invert
+VSCODE_TEST_EXCLUDE_CMD = npx vscode-test --coverage --bail --grep @exclude-ci --invert
 ifeq ($(UNAME),Linux)
-VSCODE_TEST = xvfb-run -a $(VSCODE_TEST_CMD)
 VSCODE_TEST_EXCLUDE = xvfb-run -a $(VSCODE_TEST_EXCLUDE_CMD)
 else
-VSCODE_TEST = $(VSCODE_TEST_CMD)
 VSCODE_TEST_EXCLUDE = $(VSCODE_TEST_EXCLUDE_CMD)
 endif
 
@@ -55,9 +52,9 @@ build:
 
 ## test: Fail-fast tests + coverage + threshold enforcement ([TEST-RULES]).
 test: build
-	@echo "==> Testing (fail-fast + coverage + threshold)..."
+	@echo "==> Testing (excluding @exclude-ci, fail-fast + coverage + threshold)..."
 	npm run test:unit
-	$(VSCODE_TEST)
+	$(VSCODE_TEST_EXCLUDE)
 	$(MAKE) _coverage_check
 
 ## lint: Run all linters/analyzers (read-only). Does NOT format.
@@ -97,12 +94,8 @@ _coverage_check:
 package: build
 	npx vsce package
 
-## test-exclude-ci: Run tests EXCLUDING those tagged @exclude-ci (fail-fast + coverage + threshold)
-test-exclude-ci: build
-	@echo "==> Testing (excluding @exclude-ci, fail-fast + coverage + threshold)..."
-	npm run test:unit
-	$(VSCODE_TEST_EXCLUDE)
-	$(MAKE) _coverage_check
+## test-exclude-ci: Alias for `test`; kept for existing CI workflows.
+test-exclude-ci: test
 
 ## reinstall: Full clean rebuild — uninstall extension, wipe artifacts + VSIX + node_modules, reinstall deps, package, install
 reinstall:
@@ -150,5 +143,5 @@ help:
 	@echo ""
 	@echo "Repo-specific:"
 	@echo "  package          - Build VSIX package"
-	@echo "  test-exclude-ci  - Run tests excluding those tagged @exclude-ci"
+	@echo "  test-exclude-ci  - Alias for test"
 	@echo "  reinstall        - Full clean: uninstall, wipe everything, rebuild, package, install VSIX"

coverage-thresholds.json

@@ -1,8 +1,8 @@
 {
   "_agent_pmo": "f481f8d",
   "_doc": "Single source of truth for code coverage thresholds. See REPO-STANDARDS-SPEC [COVERAGE-THRESHOLDS-JSON]. Enforced by tools/check-coverage.mjs via `make test`. Ratchet UP only. Extended format (per-metric) overrides the spec's single default_threshold to enforce both line AND branch coverage per [COVERAGE-THRESHOLDS] (VS Code extension: 80% line / 70% branch — measured values here are well above).",
-  "lines": 91.29,
-  "functions": 93.16,
-  "branches": 86.59,
-  "statements": 91.29
+  "lines": 92.11,
+  "functions": 93.87,
+  "branches": 87.33,
+  "statements": 92.11
 }

package.json

@@ -394,7 +394,7 @@
     "format:check": "prettier --check \"src/**/*.ts\"",
     "pretest": "npm run compile",
     "test": "npm run test:unit && npm run test:e2e",
-    "test:unit": "mocha out/test/unit/**/*.test.js",
+    "test:unit": "mocha --bail out/test/unit/**/*.test.js",
     "test:e2e": "vscode-test",
     "test:coverage": "vscode-test --coverage",
     "coverage:check": "node tools/check-coverage.mjs",

src/extension.ts

@@ -10,13 +10,18 @@ import { TaskRunner } from "./runners/TaskRunner";
 import { QuickTasksProvider } from "./QuickTasksProvider";
 import { logger } from "./utils/logger";
 import { initDb, disposeDb } from "./db/lifecycle";
-import { summariseAllTasks, registerAllCommands } from "./semantic/summaryPipeline";
-import { createVSCodeFileSystem } from "./semantic/vscodeAdapters";
 import { forceSelectModel } from "./semantic/summariser";
 import { syncTagsFromConfig } from "./tags/tagSync";
 import { setupFileWatchers } from "./watchers";
 import { PrivateTaskDecorationProvider } from "./tree/PrivateTaskDecorationProvider";
 import { appState } from "./state";
+import {
+  initAiSummaries,
+  registerDiscoveredCommands,
+  runSummarisation,
+  syncAndSummarise,
+} from "./summaryOrchestration";
+import type { SummaryDeps } from "./summaryOrchestration";
 
 const MAKE_EXECUTABLE_COMMAND = "commandtree.makeExecutable";
 const EXECUTE_PERMISSION_BITS = 0o111;
@@ -48,6 +53,14 @@ function getTaskRunner(): TaskRunner {
   return appState.taskRunner;
 }
 
+function getSummaryDeps(workspaceRoot: string): SummaryDeps {
+  return {
+    workspaceRoot,
+    treeProvider: getTreeProvider(),
+    quickTasksProvider: getQuickTasksProvider(),
+  };
+}
+
 export async function activate(context: vscode.ExtensionContext): Promise<ExtensionExports | undefined> {
   const workspaceRoot = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
   logger.info("Extension activating", { workspaceRoot });
@@ -76,7 +89,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<Extens
 function runBackgroundStartup(workspaceRoot: string): void {
   initialDiscovery(workspaceRoot)
     .then(() => {
-      initAiSummaries(workspaceRoot);
+      initAiSummaries(getSummaryDeps(workspaceRoot));
     })
     .catch((e: unknown) => {
       logger.error("Initial discovery failed", {
@@ -96,7 +109,7 @@ function setupWatchers(context: vscode.ExtensionContext, workspaceRoot: string):
   setupFileWatchers({
     context,
     onTaskFileChange: () => {
-      syncAndSummarise(workspaceRoot).catch((e: unknown) => {
+      syncAndSummarise(getSummaryDeps(workspaceRoot)).catch((e: unknown) => {
         logger.error("Sync failed", {
           error: e instanceof Error ? e.message : "Unknown",
         });
@@ -115,7 +128,7 @@ function setupWatchers(context: vscode.ExtensionContext, workspaceRoot: string):
 async function initialDiscovery(workspaceRoot: string): Promise<void> {
   await syncQuickTasks();
   logger.info("syncQuickTasks complete", { taskCount: getTreeProvider().getAllTasks().length });
-  await registerDiscoveredCommands(workspaceRoot);
+  await registerDiscoveredCommands(getSummaryDeps(workspaceRoot));
   await syncTagsFromJson(workspaceRoot);
 }
 
@@ -192,7 +205,7 @@ function registerFilterCommands(context: vscode.ExtensionContext): void {
     vscode.commands.registerCommand("commandtree.generateSummaries", async () => {
       const workspaceRoot = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
       if (workspaceRoot !== undefined) {
-        await runSummarisation(workspaceRoot);
+        await runSummarisation(getSummaryDeps(workspaceRoot));
       }
     }),
     vscode.commands.registerCommand("commandtree.selectModel", async () => {
@@ -201,7 +214,7 @@ function registerFilterCommands(context: vscode.ExtensionContext): void {
         vscode.window.showInformationMessage(`CommandTree: AI model set to ${result.value}`);
         const workspaceRoot = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
         if (workspaceRoot !== undefined) {
-          await runSummarisation(workspaceRoot);
+          await runSummarisation(getSummaryDeps(workspaceRoot));
         }
       } else {
         vscode.window.showWarningMessage(`CommandTree: ${result.error}`);
@@ -395,72 +408,6 @@ async function pickOrCreateTag(existingTags: string[], taskLabel: string): Promi
   });
 }
 
-async function registerDiscoveredCommands(workspaceRoot: string): Promise<void> {
-  const tasks = getTreeProvider().getAllTasks();
-  if (tasks.length === 0) {
-    return;
-  }
-  const result = await registerAllCommands({
-    tasks,
-    workspaceRoot,
-    fs: createVSCodeFileSystem(),
-  });
-  if (!result.ok) {
-    logger.warn("Command registration failed", { error: result.error });
-  } else {
-    logger.info("Commands registered in DB", { count: result.value });
-  }
-}
-
-function initAiSummaries(workspaceRoot: string): void {
-  const aiConfig = vscode.workspace.getConfiguration("commandtree").get<boolean>("enableAiSummaries");
-  if (aiConfig === false) {
-    return;
-  }
-  vscode.commands.executeCommand("setContext", "commandtree.aiSummariesEnabled", true);
-  runSummarisation(workspaceRoot).catch((e: unknown) => {
-    logger.error("AI summarisation failed", {
-      error: e instanceof Error ? e.message : "Unknown",
-    });
-  });
-}
-
-async function runSummarisation(workspaceRoot: string): Promise<void> {
-  const tasks = getTreeProvider().getAllTasks();
-  logger.info("[SUMMARY] Starting", { taskCount: tasks.length });
-  if (tasks.length === 0) {
-    logger.warn("[SUMMARY] No tasks to summarise");
-    return;
-  }
-  const summaryResult = await summariseAllTasks({
-    tasks,
-    workspaceRoot,
-    fs: createVSCodeFileSystem(),
-    onProgress: (done, total, label) => {
-      logger.info(`[SUMMARY] ${label}`, { done, total });
-    },
-  });
-  if (!summaryResult.ok) {
-    logger.error("Summary pipeline failed", { error: summaryResult.error });
-    vscode.window.showErrorMessage(`CommandTree: Summary failed — ${summaryResult.error}`);
-    return;
-  }
-  if (summaryResult.value > 0) {
-    await getTreeProvider().refresh();
-    getQuickTasksProvider().updateTasks(getTreeProvider().getAllTasks());
-  }
-  vscode.window.showInformationMessage(`CommandTree: Summarised ${summaryResult.value} commands`);
-}
-
-async function syncAndSummarise(workspaceRoot: string): Promise<void> {
-  await syncQuickTasks();
-  await registerDiscoveredCommands(workspaceRoot);
-  const aiConfig = vscode.workspace.getConfiguration("commandtree").get<boolean>("enableAiSummaries");
-  if (aiConfig !== false) {
-    await runSummarisation(workspaceRoot);
-  }
-}
-
 function updateFilterContext(): void {
   vscode.commands.executeCommand("setContext", "commandtree.hasFilter", getTreeProvider().hasFilter());
 }