principles-disciple 1.34.1 → 1.35.0

package/src/utils/workspace-resolver.ts

@@ -0,0 +1,54 @@
+/**
+ * Workspace Directory Resolution Utilities
+ *
+ * Shared helpers for resolving workspace directories across commands and hooks.
+ */
+
+import type { OpenClawPluginApi } from '../openclaw-sdk.js';
+import { validateWorkspaceDir, type WorkspaceResolutionContext } from '../core/workspace-dir-validation.js';
+import { resolveWorkspaceDir } from '../core/workspace-dir-service.js';
+import { resolveWorkspaceDirFromApi } from '../core/path-resolver.js';
+
+/**
+ * Resolve workspace directory for command execution.
+ *
+ * Chain: ctx.workspaceDir → resolveWorkspaceDirFromApi (official OpenClaw API + env vars)
+ *
+ * CRITICAL: Throws if workspaceDir cannot be resolved. Silent failures are dangerous
+ * because commands might operate on the wrong directory.
+ */
+export function resolveCommandWorkspaceDir(
+  api: OpenClawPluginApi,
+  ctx: { workspaceDir?: string },
+): string {
+  // 1. Direct from command context (most reliable — set by OpenClaw for current session)
+  if (ctx.workspaceDir) {
+    const issue = validateWorkspaceDir(ctx.workspaceDir);
+    if (!issue) return ctx.workspaceDir;
+    api.logger.error(`[PD:Command] ctx.workspaceDir="${ctx.workspaceDir}" is invalid: ${issue}`);
+  }
+
+  // 2. Official OpenClaw API → env vars → config file
+  const resolved = resolveWorkspaceDirFromApi(api);
+  if (resolved) return resolved;
+
+  // CRITICAL FAILURE: Cannot determine workspace directory
+  const errorMsg = `[PD:Command] CRITICAL: Cannot resolve workspace directory. ` +
+    `ctx.workspaceDir="${ctx.workspaceDir}" is invalid, and all fallbacks failed. ` +
+    `Commands will NOT execute to prevent data corruption.`;
+  api.logger.error(errorMsg);
+
+  throw new Error(errorMsg);
+}
+
+/**
+ * Resolve workspace directory for tool hook execution (safe version).
+ * Returns undefined instead of throwing if resolution fails.
+ */
+export function resolveToolHookWorkspaceDirSafe(
+  ctx: WorkspaceResolutionContext,
+  api: OpenClawPluginApi,
+  source: string,
+): string | undefined {
+  return resolveWorkspaceDir(api, ctx, { source });
+}

package/tests/core/workspace-dir-validation.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import * as os from 'os';
-import { validateWorkspaceDir, resolveValidWorkspaceDir, logWorkspaceDirHealth } from '../../src/core/workspace-dir-validation.js';
+import { validateWorkspaceDir, resolveValidWorkspaceDir, logWorkspaceDirHealth } from '../../src/core/workspace-dir-service.js';
 
 const homeDir = os.homedir();
 

package/tests/integration/tool-hooks-workspace-dir.e2e.test.ts

@@ -65,7 +65,7 @@ describe('E2E: Tool Hooks workspaceDir Resolution', () => {
 
   describe('Scenario 2: ctx.workspaceDir is undefined (current OpenClaw behavior)', () => {
     it('should fallback to agentId resolution', async () => {
-      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-validation.js');
+      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-service.js');
       
       const mockApi = createMockApi(testWorkspaceDir);
       const ctx = { 
@@ -80,7 +80,7 @@ describe('E2E: Tool Hooks workspaceDir Resolution', () => {
     });
 
     it('should refuse to guess a workspace when agentId is also undefined', async () => {
-      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-validation.js');
+      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-service.js');
       
       const mockApi = createMockApi(testWorkspaceDir);
       const ctx = { 
@@ -131,7 +131,7 @@ describe('E2E: Tool Hooks workspaceDir Resolution', () => {
 
   describe('Scenario 4: Invalid workspace candidates are rejected', () => {
     it('should return undefined when all workspace resolution candidates are invalid', async () => {
-      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-validation.js');
+      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-service.js');
       
       const mockApi = createMockApi(os.homedir());
       mockApi.runtime.agent.resolveAgentWorkspaceDir.mockReturnValue(os.homedir());

package/vitest.config.ts

@@ -1,12 +1,41 @@
 import { defineConfig } from 'vitest/config';
 
+/**
+ * Vitest configuration with test layering
+ *
+ * LAYERS:
+ * - unit: Mock-based tests, no real DB (fast, parallel)
+ * - integration: Tests using real SQLite DB (requires threads pool)
+ *
+ * USAGE:
+ * - npm test              → run all tests
+ * - npm run test:unit     → run unit tests only (fast)
+ * - npm run test:integration → run integration tests only
+ *
+ * WHY threads pool?
+ * better-sqlite3 native handles don't clean up properly in fork subprocesses,
+ * causing teardown hangs. Threads pool handles this correctly.
+ */
+
+// Integration tests: use real SQLite database
+const integrationTests = [
+  'tests/core/control-ui-db.test.ts',
+  'tests/core/evolution-logger.test.ts',
+  'tests/core/nocturnal-e2e.test.ts',
+  'tests/core/nocturnal-trajectory-extractor.test.ts',
+  'tests/core/replay-engine.test.ts',
+  'tests/core/trajectory.test.ts',
+  'tests/integration/**/*.test.ts',
+  'tests/integration/**/*.test.tsx',
+  'tests/service/nocturnal-service-code-candidate.test.ts',
+  'tests/service/nocturnal-target-selector.test.ts',
+];
+
 export default defineConfig({
   test: {
     environment: 'node',
     include: ['tests/**/*.test.ts', 'tests/**/*.test.tsx'],
-    // vitest 4: pool: 'forks' 默认启用隔离，每个测试文件在独立进程中运行
-    pool: 'forks',
-    // 确保测试完成后进程能正常退出
+    pool: 'threads',
     teardownTimeout: 15000,
     coverage: {
       provider: 'v8',
@@ -18,6 +47,24 @@ export default defineConfig({
         branches: 60,
         statements: 70,
       },
-    }
-  }
-});
+    },
+    // Workspace projects for layered testing
+    projects: [
+      {
+        test: {
+          name: 'unit',
+          include: ['tests/**/*.test.ts', 'tests/**/*.test.tsx'],
+          exclude: integrationTests,
+          pool: 'threads',
+        },
+      },
+      {
+        test: {
+          name: 'integration',
+          include: integrationTests,
+          pool: 'threads',
+        },
+      },
+    ],
+  },
+});