skimpyclaw 0.3.4 → 0.3.5

package/dist/__tests__/api.test.js

@@ -1225,3 +1225,22 @@ describe('Skills endpoints', () => {
         expect(res.json()).toHaveProperty('deleted', true);
     });
 });
+describe('Office endpoints', () => {
+    it('GET /api/dashboard/office-status returns office status', async () => {
+        const res = await inject({ method: 'GET', url: '/api/dashboard/office-status' });
+        expect(res.statusCode).toBe(200);
+        const json = res.json();
+        expect(json).toHaveProperty('state');
+        expect(json).toHaveProperty('currentTask');
+        expect(json).toHaveProperty('updatedAt');
+        expect(['working', 'thinking', 'waiting', 'offline']).toContain(json.state);
+    });
+    it('GET /api/dashboard/office-scene.png returns image or 404', async () => {
+        const res = await inject({ method: 'GET', url: '/api/dashboard/office-scene.png' });
+        // In test env the image file may not exist, so accept 200 or 404
+        expect([200, 404]).toContain(res.statusCode);
+        if (res.statusCode === 200) {
+            expect(res.headers['content-type']).toBe('image/png');
+        }
+    });
+});

package/dist/__tests__/doctor.runner.test.js

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-const { mockLoadConfig, mockCheckNodeVersion, mockCheckPackageManagerAvailable, mockCheckTypeScriptCompile, mockCheckConfigExistsAndValidJson, mockCheckRequiredEnvVars, mockCheckEnvVarPatterns, mockCheckAllowedPathsWritable, mockCheckProviderAuth, mockCheckTelegramToken, mockCheckDiscordToken, mockCheckBrowserBinaryIfEnabled, mockCheckVoiceDependencies, mockCheckMcpConfig, mockCheckGatewayHostBindable, mockCheckSkimpyclawDirWritable, mockCheckPortAvailability, mockCheckSandboxAvailable, } = vi.hoisted(() => ({
+const { mockLoadConfig, mockCheckNodeVersion, mockCheckPackageManagerAvailable, mockCheckTypeScriptCompile, mockCheckConfigExistsAndValidJson, mockCheckRequiredEnvVars, mockCheckEnvVarPatterns, mockCheckAllowedPathsWritable, mockCheckProviderAuth, mockCheckTelegramToken, mockCheckDiscordToken, mockCheckBrowserBinaryIfEnabled, mockCheckPlaywrightIfBrowserEnabled, mockCheckVoiceDependencies, mockCheckMcpConfig, mockCheckGatewayHostBindable, mockCheckSkimpyclawDirWritable, mockCheckPortAvailability, mockCheckSandboxAvailable, } = vi.hoisted(() => ({
     mockLoadConfig: vi.fn(),
     mockCheckNodeVersion: vi.fn(),
     mockCheckPackageManagerAvailable: vi.fn(),
@@ -12,6 +12,7 @@ const { mockLoadConfig, mockCheckNodeVersion, mockCheckPackageManagerAvailable,
     mockCheckTelegramToken: vi.fn(),
     mockCheckDiscordToken: vi.fn(),
     mockCheckBrowserBinaryIfEnabled: vi.fn(),
+    mockCheckPlaywrightIfBrowserEnabled: vi.fn(),
     mockCheckVoiceDependencies: vi.fn(),
     mockCheckMcpConfig: vi.fn(),
     mockCheckGatewayHostBindable: vi.fn(),
@@ -34,6 +35,7 @@ vi.mock('../doctor/checks.js', () => ({
     checkTelegramToken: mockCheckTelegramToken,
     checkDiscordToken: mockCheckDiscordToken,
     checkBrowserBinaryIfEnabled: mockCheckBrowserBinaryIfEnabled,
+    checkPlaywrightIfBrowserEnabled: mockCheckPlaywrightIfBrowserEnabled,
     checkVoiceDependencies: mockCheckVoiceDependencies,
     checkMcpConfig: mockCheckMcpConfig,
     checkGatewayHostBindable: mockCheckGatewayHostBindable,
@@ -75,6 +77,7 @@ describe('doctor runner', () => {
         mockCheckTelegramToken.mockReset();
         mockCheckDiscordToken.mockReset();
         mockCheckBrowserBinaryIfEnabled.mockReset();
+        mockCheckPlaywrightIfBrowserEnabled.mockReset();
         mockCheckVoiceDependencies.mockReset();
         mockCheckMcpConfig.mockReset();
         mockCheckGatewayHostBindable.mockReset();
@@ -92,6 +95,7 @@ describe('doctor runner', () => {
         mockCheckTelegramToken.mockResolvedValue(okCheck('telegram_token_valid', 'channels'));
         mockCheckDiscordToken.mockResolvedValue(okCheck('discord_token_valid', 'channels'));
         mockCheckBrowserBinaryIfEnabled.mockResolvedValue(okCheck('browser_binary_available', 'runtime'));
+        mockCheckPlaywrightIfBrowserEnabled.mockResolvedValue(okCheck('playwright_installed', 'runtime', 'Browser tools disabled'));
         mockCheckVoiceDependencies.mockResolvedValue(okCheck('voice_dependencies', 'runtime', 'Voice disabled'));
         mockCheckMcpConfig.mockResolvedValue(okCheck('mcp_config', 'runtime', 'MCP tools not configured'));
         mockCheckGatewayHostBindable.mockResolvedValue(okCheck('gateway_host_bindable', 'runtime', '127.0.0.1 (always available)'));

package/dist/__tests__/package-manager-detection.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/package-manager-detection.test.js

@@ -0,0 +1,172 @@
+import { describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { join } from 'path';
+import { mkdtempSync, writeFileSync, rmSync } from 'fs';
+import { tmpdir } from 'os';
+// Import the real functions (no mocks needed — these are pure fs reads)
+import { detectPackageManager, buildValidationCommand } from '../code-agents/executor.js';
+describe('detectPackageManager', () => {
+    let tempDir;
+    beforeEach(() => {
+        tempDir = mkdtempSync(join(tmpdir(), 'pm-detect-'));
+    });
+    afterEach(() => {
+        rmSync(tempDir, { recursive: true, force: true });
+    });
+    it('returns pnpm as fallback when no indicators present', () => {
+        expect(detectPackageManager(tempDir)).toBe('pnpm');
+    });
+    it('detects yarn from packageManager field', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            packageManager: 'yarn@4.1.0',
+        }));
+        expect(detectPackageManager(tempDir)).toBe('yarn');
+    });
+    it('detects pnpm from packageManager field', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            packageManager: 'pnpm@9.0.0',
+        }));
+        expect(detectPackageManager(tempDir)).toBe('pnpm');
+    });
+    it('detects npm from packageManager field', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            packageManager: 'npm@10.0.0',
+        }));
+        expect(detectPackageManager(tempDir)).toBe('npm');
+    });
+    it('detects bun from packageManager field', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            packageManager: 'bun@1.0.0',
+        }));
+        expect(detectPackageManager(tempDir)).toBe('bun');
+    });
+    it('detects yarn from yarn.lock', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({ name: 'test' }));
+        writeFileSync(join(tempDir, 'yarn.lock'), '');
+        expect(detectPackageManager(tempDir)).toBe('yarn');
+    });
+    it('detects pnpm from pnpm-lock.yaml', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({ name: 'test' }));
+        writeFileSync(join(tempDir, 'pnpm-lock.yaml'), '');
+        expect(detectPackageManager(tempDir)).toBe('pnpm');
+    });
+    it('detects npm from package-lock.json', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({ name: 'test' }));
+        writeFileSync(join(tempDir, 'package-lock.json'), '{}');
+        expect(detectPackageManager(tempDir)).toBe('npm');
+    });
+    it('detects bun from bun.lockb', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({ name: 'test' }));
+        writeFileSync(join(tempDir, 'bun.lockb'), '');
+        expect(detectPackageManager(tempDir)).toBe('bun');
+    });
+    it('detects bun from bun.lock', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({ name: 'test' }));
+        writeFileSync(join(tempDir, 'bun.lock'), '');
+        expect(detectPackageManager(tempDir)).toBe('bun');
+    });
+    it('packageManager field takes priority over lockfile', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            packageManager: 'yarn@4.1.0',
+        }));
+        // Also has a pnpm lockfile — packageManager should win
+        writeFileSync(join(tempDir, 'pnpm-lock.yaml'), '');
+        expect(detectPackageManager(tempDir)).toBe('yarn');
+    });
+    it('handles malformed package.json gracefully', () => {
+        writeFileSync(join(tempDir, 'package.json'), 'not valid json{{{');
+        expect(detectPackageManager(tempDir)).toBe('pnpm');
+    });
+    // wp-calypso case: yarn project with yarn.lock
+    it('detects yarn for wp-calypso-like project', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'wp-calypso',
+            scripts: { build: 'yarn build:client', test: 'jest' },
+        }));
+        writeFileSync(join(tempDir, 'yarn.lock'), '# yarn lockfile v1\n');
+        expect(detectPackageManager(tempDir)).toBe('yarn');
+    });
+});
+describe('buildValidationCommand', () => {
+    let tempDir;
+    beforeEach(() => {
+        tempDir = mkdtempSync(join(tmpdir(), 'pm-cmd-'));
+    });
+    afterEach(() => {
+        rmSync(tempDir, { recursive: true, force: true });
+    });
+    it('returns pnpm build && pnpm test for pnpm project with both scripts', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            scripts: { build: 'tsc', test: 'vitest' },
+        }));
+        writeFileSync(join(tempDir, 'pnpm-lock.yaml'), '');
+        expect(buildValidationCommand(tempDir)).toBe('pnpm build && pnpm test');
+    });
+    it('returns yarn build && yarn test for yarn project with both scripts', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            scripts: { build: 'tsc', test: 'jest' },
+        }));
+        writeFileSync(join(tempDir, 'yarn.lock'), '');
+        expect(buildValidationCommand(tempDir)).toBe('yarn build && yarn test');
+    });
+    it('returns npm run build && npm run test for npm project with both scripts', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            scripts: { build: 'tsc', test: 'jest' },
+        }));
+        writeFileSync(join(tempDir, 'package-lock.json'), '{}');
+        expect(buildValidationCommand(tempDir)).toBe('npm run build && npm run test');
+    });
+    it('returns bun build && bun test for bun project with both scripts', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            scripts: { build: 'bun build', test: 'bun test' },
+        }));
+        writeFileSync(join(tempDir, 'bun.lockb'), '');
+        expect(buildValidationCommand(tempDir)).toBe('bun build && bun test');
+    });
+    it('returns only test command when build script is missing', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            scripts: { test: 'jest' },
+        }));
+        writeFileSync(join(tempDir, 'yarn.lock'), '');
+        expect(buildValidationCommand(tempDir)).toBe('yarn test');
+    });
+    it('returns only build command when test script is missing', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            scripts: { build: 'tsc' },
+        }));
+        writeFileSync(join(tempDir, 'yarn.lock'), '');
+        expect(buildValidationCommand(tempDir)).toBe('yarn build');
+    });
+    it('falls back to both commands when no package.json exists', () => {
+        // No package.json, no lockfile → pnpm fallback
+        expect(buildValidationCommand(tempDir)).toBe('pnpm build && pnpm test');
+    });
+    it('falls back to both commands when scripts object is empty', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'test',
+            scripts: {},
+        }));
+        writeFileSync(join(tempDir, 'yarn.lock'), '');
+        expect(buildValidationCommand(tempDir)).toBe('yarn build && yarn test');
+    });
+    // wp-calypso scenario
+    it('generates yarn commands for wp-calypso-like project', () => {
+        writeFileSync(join(tempDir, 'package.json'), JSON.stringify({
+            name: 'wp-calypso',
+            packageManager: 'yarn@4.5.0',
+            scripts: { build: 'yarn workspaces foreach build', test: 'jest' },
+        }));
+        writeFileSync(join(tempDir, 'yarn.lock'), '# yarn lockfile v1\n');
+        expect(buildValidationCommand(tempDir)).toBe('yarn build && yarn test');
+    });
+});

package/dist/api.js

@@ -785,6 +785,33 @@ export function registerDashboardAPI(fastify, config) {
         }
         return { denied: true, id, command: approval.command };
     });
+    // --- Office Status ---
+    fastify.get('/api/dashboard/office-status', async (request) => {
+        // Phase 1: return mock data
+        return {
+            state: 'working',
+            currentTask: 'Processing dashboard updates',
+            updatedAt: new Date().toISOString(),
+        };
+    });
+    // --- Office Scene Image ---
+    fastify.get('/api/dashboard/office-scene.png', async (_request, reply) => {
+        const home = homedir();
+        const candidates = [
+            join(home, '.skimpyclaw', 'office-preview-check.png'),
+            join(home, '.skimpyclaw', 'office-offline.png'),
+            // Container/workspace fallbacks (e.g. Codespaces, Docker where HOME=/workspace)
+            '/workspace/.skimpyclaw/office-preview-check.png',
+            '/workspace/.skimpyclaw/office-offline.png',
+        ].filter((p, i, arr) => arr.indexOf(p) === i); // dedupe if home IS /workspace
+        for (const candidate of candidates) {
+            if (existsSync(candidate)) {
+                const buffer = readFileSync(candidate);
+                return reply.type('image/png').send(buffer);
+            }
+        }
+        return reply.code(404).send({ error: 'Office scene image not found' });
+    });
     // --- Digests ---
     fastify.get('/api/dashboard/digests', async () => {
         const digests = getDigests();

package/dist/cli.js

@@ -780,10 +780,18 @@ function sandboxImageExists(runtime, image) {
     return spawnSync(runtime, ['image', 'inspect', image], { encoding: 'utf-8' }).status === 0;
 }
 function resolveSandboxDir() {
+    // 1. Check CWD (user is in repo root)
     const cwdSandbox = join(process.cwd(), 'sandbox');
     if (existsSync(join(cwdSandbox, 'Dockerfile'))) {
         return cwdSandbox;
     }
+    // 2. Check relative to package root (global/npm install)
+    const thisFile = fileURLToPath(import.meta.url);
+    const pkgRoot = join(thisFile, '..', '..'); // dist/src/cli.js -> repo root
+    const pkgSandbox = join(pkgRoot, 'sandbox');
+    if (existsSync(join(pkgSandbox, 'Dockerfile'))) {
+        return pkgSandbox;
+    }
     return null;
 }
 function parseSandboxOption(args, flag) {

package/dist/code-agents/executor.d.ts

@@ -1,4 +1,20 @@
 import type { CodeAgentBackgroundOptions, ValidationResult } from './types.js';
+/** Supported JS package managers. */
+export type PackageManager = 'pnpm' | 'yarn' | 'npm' | 'bun';
+/**
+ * Detect the package manager for a project directory.
+ * Detection order (first match wins):
+ * 1. package.json `packageManager` field (e.g. "yarn@4.1.0")
+ * 2. Lockfile presence: yarn.lock → yarn, pnpm-lock.yaml → pnpm, bun.lockb / bun.lock → bun, package-lock.json → npm
+ * 3. Fallback: 'pnpm' (SkimpyClaw default)
+ */
+export declare function detectPackageManager(workdir: string): PackageManager;
+/**
+ * Build the validation command for a project directory.
+ * Checks for `build` and `test` scripts in package.json, then runs them
+ * with the detected package manager. Falls back to `<pm> build && <pm> test`.
+ */
+export declare function buildValidationCommand(workdir: string): string;
 /** Run build/test validation. Shared by solo agents and team orchestrator. */
 export declare function runValidation(workdir: string): Promise<ValidationResult>;
 /** Background execution of a coding agent. Updates task status throughout. */

package/dist/code-agents/executor.js

@@ -1,6 +1,6 @@
 // Code Agent Executor - Background execution logic
 import { spawn, exec } from 'child_process';
-import { createWriteStream } from 'fs';
+import { createWriteStream, existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 // SKIMPYCLAW_ROOT for log paths
 const SKIMPYCLAW_ROOT = join(import.meta.dirname || process.cwd(), '..', '..');
@@ -12,10 +12,83 @@ import { startTrace, addEvent, endTrace } from '../audit.js';
 import { buildUsageRecord, recordUsage } from '../usage.js';
 import { ensureContainer, SANDBOX_DEFAULTS, getRuntime } from '../sandbox/index.js';
 const CANCELLED_MESSAGE = 'Cancelled by user';
+/**
+ * Detect the package manager for a project directory.
+ * Detection order (first match wins):
+ * 1. package.json `packageManager` field (e.g. "yarn@4.1.0")
+ * 2. Lockfile presence: yarn.lock → yarn, pnpm-lock.yaml → pnpm, bun.lockb / bun.lock → bun, package-lock.json → npm
+ * 3. Fallback: 'pnpm' (SkimpyClaw default)
+ */
+export function detectPackageManager(workdir) {
+    // 1. Check package.json packageManager field
+    try {
+        const pkgPath = join(workdir, 'package.json');
+        if (existsSync(pkgPath)) {
+            const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+            if (typeof pkg.packageManager === 'string') {
+                const name = pkg.packageManager.split('@')[0].toLowerCase();
+                if (name === 'yarn')
+                    return 'yarn';
+                if (name === 'pnpm')
+                    return 'pnpm';
+                if (name === 'npm')
+                    return 'npm';
+                if (name === 'bun')
+                    return 'bun';
+            }
+        }
+    }
+    catch { /* ignore parse errors, fall through */ }
+    // 2. Check lockfiles
+    if (existsSync(join(workdir, 'yarn.lock')))
+        return 'yarn';
+    if (existsSync(join(workdir, 'pnpm-lock.yaml')))
+        return 'pnpm';
+    if (existsSync(join(workdir, 'bun.lockb')) || existsSync(join(workdir, 'bun.lock')))
+        return 'bun';
+    if (existsSync(join(workdir, 'package-lock.json')))
+        return 'npm';
+    // 3. Fallback
+    return 'pnpm';
+}
+/**
+ * Build the validation command for a project directory.
+ * Checks for `build` and `test` scripts in package.json, then runs them
+ * with the detected package manager. Falls back to `<pm> build && <pm> test`.
+ */
+export function buildValidationCommand(workdir) {
+    const pm = detectPackageManager(workdir);
+    const run = pm === 'npm' ? 'npm run' : pm;
+    // Check which scripts exist in package.json
+    let hasBuild = false;
+    let hasTest = false;
+    try {
+        const pkgPath = join(workdir, 'package.json');
+        if (existsSync(pkgPath)) {
+            const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+            const scripts = pkg.scripts || {};
+            hasBuild = !!scripts.build;
+            hasTest = !!scripts.test;
+        }
+    }
+    catch { /* ignore */ }
+    const parts = [];
+    if (hasBuild)
+        parts.push(`${run} build`);
+    if (hasTest)
+        parts.push(`${run} test`);
+    // If neither build nor test scripts exist, still try — the scripts
+    // might be defined in a workspace root or the commands may work anyway
+    if (parts.length === 0) {
+        parts.push(`${run} build`, `${run} test`);
+    }
+    return parts.join(' && ');
+}
 /** Run build/test validation. Shared by solo agents and team orchestrator. */
 export function runValidation(workdir) {
+    const cmd = buildValidationCommand(workdir);
     return new Promise((resolve) => {
-        exec('pnpm build && pnpm test', {
+        exec(cmd, {
             cwd: workdir,
             timeout: VALIDATE_TIMEOUT_MS,
             maxBuffer: 5 * 1024 * 1024,
@@ -242,8 +315,9 @@ export async function runCodeAgentBackground(id, agent, task, workdir, validate,
             caTask.outputPreview = agentOutput.slice(0, 500);
             caTask.liveOutput = undefined;
             writeCodeAgentTask(caTask);
+            const validationCmd = buildValidationCommand(workdir);
             const runValidationPromise = () => new Promise((res) => {
-                const validationProc = exec('pnpm build && pnpm test', {
+                const validationProc = exec(validationCmd, {
                     cwd: workdir,
                     timeout: VALIDATE_TIMEOUT_MS,
                     maxBuffer: 5 * 1024 * 1024,

package/dist/code-agents/utils.js

@@ -2,6 +2,7 @@
 import { execSync } from 'child_process';
 import { resolve, join } from 'path';
 import { homedir } from 'os';
+import { buildValidationCommand } from './executor.js';
 // Resolve CLI paths once at import time so spawn doesn't get ENOENT
 function resolveCliPath(name) {
     try {
@@ -113,7 +114,7 @@ export function buildCodeAgentArgs(input) {
         '--mcp-config', playwrightMcp,
         ...toolArgs,
         '--max-turns', maxTurns,
-        '--append-system-prompt', 'Output text only. Never use say or TTS. Focus on the coding task. Run pnpm build && pnpm test to verify changes.',
+        '--append-system-prompt', `Output text only. Never use say or TTS. Focus on the coding task. Run ${buildValidationCommand(input.workdir || process.cwd())} to verify changes.`,
     ];
     // Only pass model to Claude CLI if it's not a known non-Claude model.
     // GPT/Codex/Kimi/o-series models would be rejected by the Claude CLI.
@@ -152,6 +153,10 @@ export function buildTeamNotification(task, getChildTask) {
             lines.push(`  ${childIcon} ${child.id} (${childDur}): ${subtask}`);
         }
     }
+    // Synthesis result
+    if (task.outputPreview) {
+        lines.push(`\nResult: ${task.outputPreview}`);
+    }
     // Errors
     if (task.error && task.error !== 'Validation failed') {
         lines.push(`\nError: ${task.error}`);
@@ -169,8 +174,7 @@ export function buildSoloNotification(task) {
         const validation = task.validationPassed ? ' Build/tests pass.' : '';
         let message = `✅ Coding agent ${task.id} completed (${dur}).${validation}\n\nTask: ${taskPreview}`;
         if (task.outputPreview) {
-            const preview = task.outputPreview.slice(0, 300);
-            message += `\n\nResult: ${preview}`;
+            message += `\n\nResult: ${task.outputPreview}`;
         }
         return message;
     }