twinclaw 1.1.1 → 1.1.2

package/dist/api/router.js

@@ -1,13 +1,15 @@
 import { createServer } from 'node:http';
 import express from 'express';
 import { handleHealth, handleLiveness, handleReadiness } from './handlers/health.js';
+import { handleStatus } from './handlers/status.js';
+import { handleDebug } from './handlers/debug.js';
 import { handleBrowserSnapshot, handleBrowserClick } from './handlers/browser.js';
 import { handleWebhookCallback } from './handlers/callback.js';
 import { handleSkillPackageDiagnostics, handleSkillPackageInstall, handleSkillPackageUpgrade, handleSkillPackageUninstall, } from './handlers/skill-packages.js';
 import { handleLocalStateBackupDiagnostics, handleLocalStateCreateSnapshot, handleLocalStateRestoreSnapshot, } from './handlers/local-state-backup.js';
 import { handlePersonaStateGet, handlePersonaStateUpdate, } from './handlers/persona-state.js';
 import { handleConfigValidate } from './handlers/config-validate.js';
-import { requestLogger, requireSignature, sendError, sendOk, setRawRequestBody } from './shared.js';
+import { requestLogger, requireAuth, sendError, sendOk, setRawRequestBody } from './shared.js';
 import { BrowserService } from '../services/browser-service.js';
 import { getPersonaStateService } from '../services/persona-state.js';
 import { logThought } from '../utils/logger.js';
@@ -15,6 +17,17 @@ import { getCallbackOutcomeCounts } from '../services/db.js';
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { getConfigValue } from '../config/config-loader.js';
+import { getLearningSystem } from '../services/learning-system.js';
+import { getSkillBuilder } from '../services/skill-builder.js';
+import { getAutoConfigurer } from '../services/auto-configurer.js';
+import { getSelfHealingService } from '../services/self-healing.js';
+import { getAgentImprovementTool } from '../tools/agent-improvement.js';
+import { getIntentParser } from '../services/skill-acquisition/intent-parser.js';
+import { getResearchEngine } from '../services/skill-acquisition/research-engine.js';
+import { getDevicePairingService } from '../services/device-pairing.js';
+import { handleJobsList, handleJobsGet, handleJobsRun, handleJobsStart, handleJobsStop, } from './handlers/jobs.js';
+import { handleAgentsList, handleAgentsGet, handleAgentsCancel, } from './handlers/agents.js';
+import { handleDevicesList, handleDevicesGet, handleDevicesCommand, } from './handlers/devices.js';
 const DEFAULT_PORT = 18789;
 const DEFAULT_BIND_HOST = '127.0.0.1';
 /**
@@ -77,11 +90,37 @@ export function startApiServer(deps) {
     const personaStateDeps = {
         personaStateService: getPersonaStateService(),
     };
+    const statusDeps = {
+        heartbeat: deps.heartbeat,
+        skillRegistry: deps.skillRegistry,
+        mcpManager: deps.mcpManager,
+        budgetGovernor: deps.budgetGovernor,
+        localStateBackup: deps.localStateBackup,
+        modelRouter: deps.modelRouter,
+        jobScheduler: deps.jobScheduler,
+        subAgentService: deps.subAgentService,
+        devicePairingService: getDevicePairingService(),
+        incidentManager: deps.incidentManager,
+    };
+    // Job Scheduler deps
+    const jobsDeps = {
+        scheduler: deps.jobScheduler,
+    };
+    // Sub-Agent deps
+    const agentsDeps = {
+        subAgentService: deps.subAgentService,
+    };
+    // Device Pairing deps
+    const devicesDeps = {
+        devicePairingService: getDevicePairingService(),
+    };
     // ── Routes ──────────────────────────────────────────────────────────────────
     app.get('/health', handleHealth(healthDeps));
     app.get('/health/live', handleLiveness());
     app.get('/health/ready', handleReadiness(healthDeps));
-    app.use(requireSignature);
+    app.get('/status', handleStatus(statusDeps));
+    app.get('/debug', handleDebug(statusDeps));
+    app.use(requireAuth);
     app.get('/config/validate', handleConfigValidate());
     app.get('/backup/diagnostics', handleLocalStateBackupDiagnostics(localStateBackupDeps));
     app.post('/backup/snapshot', handleLocalStateCreateSnapshot(localStateBackupDeps));
@@ -272,6 +311,237 @@ export function startApiServer(deps) {
         }
         sendOk(res, deps.wsHub.getMetrics());
     });
+    // ── Self-Improving Agent Routes ─────────────────────────────────────────────
+    app.get('/self/stats', (_req, res) => {
+        try {
+            const learning = getLearningSystem();
+            const stats = learning.getStats();
+            sendOk(res, stats);
+        }
+        catch (err) {
+            sendError(res, `Failed to get stats: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.get('/self/health', async (_req, res) => {
+        try {
+            const healer = getSelfHealingService();
+            const metrics = await healer.performHealthCheck();
+            sendOk(res, { metrics });
+        }
+        catch (err) {
+            sendError(res, `Health check failed: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.get('/self/learn', (req, res) => {
+        const query = typeof req.query.q === 'string' ? req.query.q : '';
+        if (!query) {
+            sendError(res, 'Query parameter "q" is required.', 400);
+            return;
+        }
+        try {
+            const learning = getLearningSystem();
+            const result = learning.query(query);
+            sendOk(res, result);
+        }
+        catch (err) {
+            sendError(res, `Query failed: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.post('/self/learn', async (req, res) => {
+        const { pattern, solution, type = 'fix' } = req.body;
+        if (!pattern || !solution) {
+            sendError(res, 'Required fields: pattern, solution', 400);
+            return;
+        }
+        try {
+            const learning = getLearningSystem();
+            await learning.learn(type, pattern, {}, solution, 'success');
+            sendOk(res, { message: `Learned: ${pattern} -> ${solution}` });
+        }
+        catch (err) {
+            sendError(res, `Learn failed: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.get('/self/services', (_req, res) => {
+        try {
+            const configurer = getAutoConfigurer();
+            const services = configurer.listKnownServices();
+            sendOk(res, { services });
+        }
+        catch (err) {
+            sendError(res, `Failed to list services: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.get('/self/configure/:service', async (req, res) => {
+        const service = req.params.service;
+        try {
+            const configurer = getAutoConfigurer();
+            const { config, steps } = await configurer.fetchDocsAndConfig(service);
+            sendOk(res, { service, config, steps });
+        }
+        catch (err) {
+            sendError(res, `Configure failed: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.post('/self/configure/:service', async (req, res) => {
+        const service = req.params.service;
+        const config = req.body;
+        try {
+            const configurer = getAutoConfigurer();
+            const result = await configurer.saveServiceConfig(service, config);
+            sendOk(res, result);
+        }
+        catch (err) {
+            sendError(res, `Save config failed: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.post('/self/build-skill', async (req, res) => {
+        const { description, purpose } = req.body;
+        if (!description) {
+            sendError(res, 'Required field: description', 400);
+            return;
+        }
+        try {
+            const builder = getSkillBuilder();
+            const skill = await builder.buildFromRequest({ description, purpose });
+            sendOk(res, {
+                id: skill.id,
+                name: skill.name,
+                category: skill.category,
+                location: `${builder.getCustomSkillsDir()}/${skill.id}.ts`
+            });
+        }
+        catch (err) {
+            sendError(res, `Build skill failed: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.get('/self/skills', (_req, res) => {
+        try {
+            const builder = getSkillBuilder();
+            const skills = builder.getCustomSkills();
+            sendOk(res, { skills });
+        }
+        catch (err) {
+            sendError(res, `Failed to list skills: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    app.post('/self/improve', async (req, res) => {
+        const { goal, context } = req.body;
+        if (!goal) {
+            sendError(res, 'Required field: goal', 400);
+            return;
+        }
+        try {
+            const tool = getAgentImprovementTool();
+            const result = await tool.handleImprovementRequest({ goal, context });
+            sendOk(res, result);
+        }
+        catch (err) {
+            sendError(res, `Improve request failed: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    // ── Skill Acquisition Routes ───────────────────────────────────────────────
+    // POST /api/skills/acquire - Start acquiring a new skill
+    app.post('/skills/acquire', async (req, res) => {
+        const { request } = req.body;
+        if (!request) {
+            sendError(res, 'Required field: request (natural language description)', 400);
+            return;
+        }
+        try {
+            // Step 1: Parse intent
+            const intentParser = getIntentParser();
+            const intent = await intentParser.parseIntent(request);
+            // Step 2: Research
+            const researchEngine = getResearchEngine();
+            const research = await researchEngine.research(intent);
+            // Step 3: Generate skill code
+            const skillBuilder = getSkillBuilder();
+            const skill = await skillBuilder.buildFromRequest({
+                description: request,
+                purpose: 'user requested'
+            });
+            sendOk(res, {
+                status: 'generated',
+                intent,
+                research,
+                skill: {
+                    id: skill.id,
+                    name: skill.name,
+                    description: skill.description,
+                    category: skill.category
+                },
+                nextSteps: [
+                    'Review the generated skill',
+                    'Provide credentials if needed',
+                    'Approve to activate the skill'
+                ]
+            });
+        }
+        catch (err) {
+            sendError(res, `Skill acquisition failed: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    // GET /api/skills - List all skills (built-in + custom)
+    app.get('/skills', (_req, res) => {
+        try {
+            const builder = getSkillBuilder();
+            const customSkills = builder.getCustomSkills();
+            sendOk(res, {
+                customSkills,
+                total: customSkills.length
+            });
+        }
+        catch (err) {
+            sendError(res, `Failed to list skills: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    // GET /api/skills/:id - Get skill details
+    app.get('/skills/:id', (req, res) => {
+        const { id } = req.params;
+        try {
+            const builder = getSkillBuilder();
+            const skill = builder.getSkill(id);
+            if (!skill) {
+                sendError(res, 'Skill not found', 404);
+                return;
+            }
+            sendOk(res, skill);
+        }
+        catch (err) {
+            sendError(res, `Failed to get skill: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
+    // ── Job Scheduler Routes ─────────────────────────────────────────────────────
+    app.get('/jobs', handleJobsList(jobsDeps));
+    app.get('/jobs/:id', handleJobsGet(jobsDeps));
+    app.post('/jobs/:id/run', handleJobsRun(jobsDeps));
+    app.post('/jobs/:id/start', handleJobsStart(jobsDeps));
+    app.post('/jobs/:id/stop', handleJobsStop(jobsDeps));
+    // ── Sub-Agent Routes ─────────────────────────────────────────────────────
+    app.get('/agents', handleAgentsList(agentsDeps));
+    app.get('/agents/:id', handleAgentsGet(agentsDeps));
+    app.post('/agents/:id/cancel', handleAgentsCancel(agentsDeps));
+    // ── Device Pairing Routes ───────────────────────────────────────────────
+    app.get('/devices', handleDevicesList(devicesDeps));
+    app.get('/devices/:id', handleDevicesGet(devicesDeps));
+    app.post('/devices/:id/command', handleDevicesCommand(devicesDeps));
+    // DELETE /api/skills/:id - Delete a custom skill
+    app.delete('/skills/:id', async (req, res) => {
+        const { id } = req.params;
+        try {
+            const builder = getSkillBuilder();
+            const deleted = await builder.deleteSkill(id);
+            if (!deleted) {
+                sendError(res, 'Skill not found or could not be deleted', 404);
+                return;
+            }
+            sendOk(res, { message: 'Skill deleted successfully' });
+        }
+        catch (err) {
+            sendError(res, `Failed to delete skill: ${err instanceof Error ? err.message : String(err)}`, 500);
+        }
+    });
     // ── Catch-all 404 ──────────────────────────────────────────────────────────
     app.use((_req, res) => {
         sendError(res, 'Not found.', 404);

package/dist/api/runtime-event-producer.js

@@ -60,6 +60,16 @@ export class RuntimeEventProducer {
         if (include('reliability') && this.#deps.dispatcher) {
             snapshot.reliability = this.#buildReliabilityPayload();
         }
+        if (include('jobs') && this.#deps.jobScheduler) {
+            snapshot.jobs = {
+                list: this.#deps.jobScheduler.listJobs(),
+            };
+        }
+        if (include('agents') && this.#deps.subAgentService) {
+            snapshot.agents = {
+                list: this.#deps.subAgentService.list(),
+            };
+        }
         return snapshot;
     }
     // ── Private Helpers ────────────────────────────────────────────────────────
@@ -76,6 +86,16 @@ export class RuntimeEventProducer {
         if (this.#deps.dispatcher) {
             this.#hub.publish('reliability', this.#buildReliabilityPayload());
         }
+        if (this.#deps.jobScheduler) {
+            this.#hub.publish('jobs', {
+                list: this.#deps.jobScheduler.listJobs(),
+            });
+        }
+        if (this.#deps.subAgentService) {
+            this.#hub.publish('agents', {
+                list: this.#deps.subAgentService.list(),
+            });
+        }
     }
     #buildReliabilityPayload() {
         const queueMetrics = this.#deps.dispatcher.queue.getStats() ?? null;

package/dist/api/shared.js

@@ -1,6 +1,7 @@
 import { createHmac, timingSafeEqual, randomUUID } from 'node:crypto';
 import { logThought, scrubSensitiveText } from '../utils/logger.js';
 import { getSecretVaultService } from '../services/secret-vault.js';
+import { readConfig } from '../config/config-loader.js';
 function stableStringify(value) {
     if (value === null || typeof value !== 'object') {
         const serialized = JSON.stringify(value);
@@ -112,6 +113,39 @@ export function requireSignature(req, res, next) {
     }
     next();
 }
+/**
+ * Validate token-based auth for API requests.
+ * Supports both HMAC and token modes based on gateway config.
+ */
+export async function requireAuth(req, res, next) {
+    try {
+        const config = await readConfig();
+        const authMode = config.gateway?.auth?.mode ?? 'hmac';
+        if (authMode === 'token') {
+            const token = config.gateway?.auth?.token;
+            if (!token) {
+                sendError(res, 'Gateway token not configured.', 503);
+                return;
+            }
+            const providedToken = req.headers['x-api-token'];
+            if (!providedToken || providedToken !== token) {
+                void logThought('[API] Token request rejected — invalid token.');
+                sendError(res, 'Invalid API token.', 401);
+                return;
+            }
+        }
+        else {
+            requireSignature(req, res, next);
+            return;
+        }
+        next();
+    }
+    catch (err) {
+        const { status, message } = mapError(err);
+        void logThought(`[API] Auth error: ${message}`);
+        sendError(res, message, status);
+    }
+}
 // ── Error Mapping ───────────────────────────────────────────────────────────
 /** Map a caught error to a status code and message. */
 export function mapError(err) {

package/dist/api/websocket-hub.js

@@ -3,12 +3,13 @@ import { WebSocketServer, WebSocket } from 'ws';
 import { logThought } from '../utils/logger.js';
 import { WsCloseCode } from '../types/websocket.js';
 import { getSecretVaultService } from '../services/secret-vault.js';
+import { readConfig } from '../config/config-loader.js';
 // ── Constants ──────────────────────────────────────────────────────────────────
 const DEFAULT_AUTH_TIMEOUT_MS = 5_000;
 const DEFAULT_HEARTBEAT_INTERVAL_MS = 30_000;
 /** Default backpressure threshold in kilobytes (see WsHubConfig.maxClientQueue). */
 const DEFAULT_MAX_CLIENT_QUEUE = 200;
-const VALID_TOPICS = new Set(['health', 'reliability', 'incidents', 'routing']);
+const VALID_TOPICS = new Set(['health', 'reliability', 'incidents', 'routing', 'jobs', 'agents', 'messages']);
 // ── WsHub ──────────────────────────────────────────────────────────────────────
 /**
  * Control-plane WebSocket hub.
@@ -155,7 +156,7 @@ export class WsHub {
             client.isAlive = true;
         });
         ws.on('message', (data) => {
-            this.#handleMessage(client, data);
+            void this.#handleMessage(client, data);
         });
         ws.on('close', () => {
             this.#cleanupClient(client);
@@ -166,7 +167,7 @@ export class WsHub {
         });
         void logThought(`[WsHub] New connection: ${clientId}.`);
     }
-    #handleMessage(client, rawData) {
+    async #handleMessage(client, rawData) {
         let msg;
         try {
             msg = JSON.parse(String(rawData));
@@ -181,7 +182,7 @@ export class WsHub {
         }
         switch (msg.type) {
             case 'auth':
-                this.#handleAuth(client, msg);
+                await this.#handleAuth(client, msg);
                 break;
             case 'subscribe':
                 this.#handleSubscribe(client, msg);
@@ -193,10 +194,20 @@ export class WsHub {
                 this.#sendError(client, 400, `Unknown message type: ${String(msg.type)}`);
         }
     }
-    #handleAuth(client, msg) {
+    async #handleAuth(client, msg) {
         const token = typeof msg.token === 'string' ? msg.token : '';
-        const apiSecret = getSecretVaultService().readSecret('API_SECRET') ?? '';
-        if (!apiSecret || !token || token !== apiSecret) {
+        const config = await readConfig();
+        const authMode = config.gateway?.auth?.mode ?? 'hmac';
+        let authenticated = false;
+        if (authMode === 'token') {
+            const configuredToken = config.gateway?.auth?.token ?? '';
+            authenticated = !!configuredToken && token === configuredToken;
+        }
+        else {
+            const apiSecret = getSecretVaultService().readSecret('API_SECRET') ?? '';
+            authenticated = !!apiSecret && token === apiSecret;
+        }
+        if (!authenticated) {
             this.#metrics.authFailures++;
             void logThought(`[WsHub] Client ${client.id} authentication failed (invalid token).`);
             this.#sendError(client, WsCloseCode.AuthFailed, 'Authentication failed.');