daycare-cli 0.0.0-canary.eeb4e2f → 0.0.0-canary.efefcae

package/dist/api/app-server/appEmailConnect.js

@@ -0,0 +1,134 @@
+import { userConnectorKeyCreate } from "../../storage/userConnectorKeyCreate.js";
+import { jwtSign, jwtVerify } from "../../utils/jwt.js";
+import { appAuthPayloadUrlBuild } from "./appAuthLinkTool.js";
+export const APP_EMAIL_CONNECT_EXPIRES_IN_SECONDS = 15 * 60;
+const APP_EMAIL_CONNECT_SERVICE = "daycare.app-auth.connect-email";
+/**
+ * Sends and verifies email-connection links for an existing Daycare user.
+ * Expects: secret is stable for the app server and mailSend delivers outbound email.
+ */
+export class AppEmailConnect {
+    users;
+    host;
+    port;
+    secret;
+    serverEndpoint;
+    appEndpoint;
+    replyTo;
+    mailSend;
+    constructor(options) {
+        this.users = options.users;
+        this.host = options.host;
+        this.port = options.port;
+        this.secret = options.secret;
+        this.serverEndpoint = options.serverEndpoint;
+        this.appEndpoint = options.appEndpoint;
+        this.replyTo = options.replyTo;
+        this.mailSend = options.mailSend;
+    }
+    async request(userId, email, _headers) {
+        const normalizedUserId = userId.trim();
+        const normalizedEmail = appEmailNormalize(email);
+        if (!normalizedUserId) {
+            throw new Error("User is required.");
+        }
+        if (!normalizedEmail) {
+            throw new Error("Email is required.");
+        }
+        const user = await this.users.findById(normalizedUserId);
+        if (!user) {
+            throw new Error("User not found.");
+        }
+        const connectorKey = userConnectorKeyCreate("email", normalizedEmail);
+        const existing = await this.users.findByConnectorKey(connectorKey);
+        if (existing?.id === normalizedUserId) {
+            throw new Error("Email is already connected.");
+        }
+        if (existing) {
+            throw new Error("Email is already connected to another account.");
+        }
+        const token = await appEmailConnectTokenSign(this.secret, {
+            userId: normalizedUserId,
+            email: normalizedEmail
+        });
+        await this.mailSend(appEmailConnectMessageBuild({
+            email: normalizedEmail,
+            token,
+            host: this.host,
+            port: this.port,
+            serverEndpoint: this.serverEndpoint,
+            appEndpoint: this.appEndpoint,
+            replyTo: this.replyTo
+        }));
+    }
+    async verify(token) {
+        const normalizedToken = token.trim();
+        if (!normalizedToken) {
+            throw new Error("Magic-link token is required.");
+        }
+        const payload = await appEmailConnectTokenVerify(normalizedToken, this.secret);
+        const user = await this.users.findById(payload.userId);
+        if (!user) {
+            throw new Error("User not found.");
+        }
+        const connectorKey = userConnectorKeyCreate("email", payload.email);
+        const existing = await this.users.findByConnectorKey(connectorKey);
+        if (existing?.id === payload.userId) {
+            return payload;
+        }
+        if (existing) {
+            throw new Error("Email is already connected to another account.");
+        }
+        await this.users.addConnectorKey(payload.userId, connectorKey);
+        return payload;
+    }
+}
+function appEmailNormalize(email) {
+    return email.trim().toLowerCase();
+}
+async function appEmailConnectTokenSign(secret, payload) {
+    return jwtSign({
+        userId: Buffer.from(JSON.stringify(payload), "utf8").toString("base64url")
+    }, secret, APP_EMAIL_CONNECT_EXPIRES_IN_SECONDS, {
+        service: APP_EMAIL_CONNECT_SERVICE
+    });
+}
+async function appEmailConnectTokenVerify(token, secret) {
+    const verified = await jwtVerify(token, secret, {
+        service: APP_EMAIL_CONNECT_SERVICE
+    });
+    try {
+        const parsed = JSON.parse(Buffer.from(verified.userId, "base64url").toString("utf8"));
+        const userId = typeof parsed.userId === "string" ? parsed.userId.trim() : "";
+        const email = typeof parsed.email === "string" ? appEmailNormalize(parsed.email) : "";
+        if (!userId || !email) {
+            throw new Error("Invalid email connect token payload.");
+        }
+        return {
+            userId,
+            email
+        };
+    }
+    catch {
+        throw new Error("Invalid email connect token payload.");
+    }
+}
+function appEmailConnectMessageBuild(options) {
+    const url = appAuthPayloadUrlBuild(options.host, options.port, {
+        backendUrl: options.serverEndpoint?.trim() ?? "",
+        token: options.token,
+        kind: "connect-email"
+    }, options.appEndpoint, options.serverEndpoint);
+    return {
+        to: options.email,
+        subject: "Connect your email to Daycare",
+        replyTo: options.replyTo,
+        text: `Use this link to connect your email to Daycare: ${url}`,
+        html: [
+            "<p>Use this link to connect your email to Daycare.</p>",
+            `<p><a href="${url}">Connect email</a></p>`,
+            `<p>${url}</p>`
+        ].join("")
+    };
+}
+//# sourceMappingURL=appEmailConnect.js.map

package/dist/api/app-server/appEmailConnect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appEmailConnect.js","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailConnect.ts"],"names":[],"mappings":"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"}

package/dist/api/app-server/appEmailConnect.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=appEmailConnect.spec.d.ts.map

package/dist/api/app-server/appEmailConnect.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"appEmailConnect.spec.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailConnect.spec.ts"],"names":[],"mappings":""}

package/dist/api/app-server/appEmailConnect.spec.js

@@ -0,0 +1,93 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { storageOpenTest } from "../../storage/storageOpenTest.js";
+import { userConnectorKeyCreate } from "../../storage/userConnectorKeyCreate.js";
+import { AppEmailConnect } from "./appEmailConnect.js";
+const activeStorages = [];
+describe("AppEmailConnect", () => {
+    afterEach(async () => {
+        await Promise.all(activeStorages.splice(0).map((storage) => storage.connection.close()));
+    });
+    it("sends a connect-email payload to the app auth screen", async () => {
+        const sent = [];
+        const storage = await storageOpenTest();
+        activeStorages.push(storage);
+        const user = await storage.users.create({});
+        const connect = new AppEmailConnect({
+            users: storage.users,
+            host: "127.0.0.1",
+            port: 7332,
+            serverEndpoint: "https://api.example.com",
+            appEndpoint: "https://app.example.com",
+            secret: "12345678901234567890123456789012",
+            mailSend: async (message) => {
+                sent.push(message);
+            }
+        });
+        await connect.request(user.id, "person@example.com");
+        expect(sent).toHaveLength(1);
+        expect(sent[0]?.to).toBe("person@example.com");
+        const payload = appEmailPayloadDecode(sent[0]?.text ?? "");
+        expect(payload.backendUrl).toBe("https://api.example.com");
+        expect(payload.kind).toBe("connect-email");
+        expect(typeof payload.token).toBe("string");
+        expect(payload.token.length).toBeGreaterThan(0);
+    });
+    it("verifies a connect-email token and adds the connector key to the existing user", async () => {
+        const sent = [];
+        const storage = await storageOpenTest();
+        activeStorages.push(storage);
+        const user = await storage.users.create({});
+        const connect = new AppEmailConnect({
+            users: storage.users,
+            host: "127.0.0.1",
+            port: 7332,
+            serverEndpoint: "https://api.example.com",
+            appEndpoint: "https://app.example.com",
+            secret: "12345678901234567890123456789012",
+            mailSend: async (message) => {
+                sent.push(message);
+            }
+        });
+        await connect.request(user.id, "person@example.com");
+        const payload = appEmailPayloadDecode(sent[0]?.text ?? "");
+        const verified = await connect.verify(payload.token);
+        const reloaded = await storage.users.findById(user.id);
+        expect(verified).toEqual({
+            userId: user.id,
+            email: "person@example.com"
+        });
+        expect(reloaded?.connectorKeys.map((entry) => entry.connectorKey)).toContain(userConnectorKeyCreate("email", "person@example.com"));
+    });
+    it("rejects emails already connected to another user", async () => {
+        const sent = [];
+        const storage = await storageOpenTest();
+        activeStorages.push(storage);
+        await storage.users.create({
+            connectorKey: userConnectorKeyCreate("email", "person@example.com")
+        });
+        const user = await storage.users.create({});
+        const connect = new AppEmailConnect({
+            users: storage.users,
+            host: "127.0.0.1",
+            port: 7332,
+            secret: "12345678901234567890123456789012",
+            mailSend: async (message) => {
+                sent.push(message);
+            }
+        });
+        await expect(connect.request(user.id, "person@example.com")).rejects.toThrow("Email is already connected to another account.");
+    });
+});
+function appEmailPayloadDecode(text) {
+    const match = text.match(/https?:\/\/\S+/);
+    if (!match?.[0]) {
+        throw new Error("Expected auth URL in email body.");
+    }
+    const url = new URL(match[0]);
+    const encoded = url.hash.startsWith("#") ? url.hash.slice(1) : url.hash;
+    if (!encoded) {
+        throw new Error("Expected auth hash payload.");
+    }
+    return JSON.parse(Buffer.from(encoded, "base64url").toString("utf8"));
+}
+//# sourceMappingURL=appEmailConnect.spec.js.map

package/dist/api/app-server/appEmailConnect.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appEmailConnect.spec.js","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailConnect.spec.ts"],"names":[],"mappings":"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"}

package/dist/api/app-server/appServer.d.ts

@@ -1,21 +1,52 @@
-import type { Context, TaskActiveSummary } from "@/types";
+import type { AgentPath, AgentSkill, Context, TaskActiveSummary, TaskListAllResult } from "@/types";
 import type { AuthStore } from "../../auth/store.js";
 import type { ConfigModule } from "../../engine/config/configModule.js";
+import type { EngineEventBus } from "../../engine/ipc/events.js";
 import type { CommandRegistry } from "../../engine/modules/commandRegistry.js";
 import type { ConnectorRegistry } from "../../engine/modules/connectorRegistry.js";
 import type { ToolResolver } from "../../engine/modules/toolResolver.js";
+import type { Secret } from "../../engine/secrets/secretTypes.js";
 import type { Webhooks } from "../../engine/webhook/webhooks.js";
+import type { DaycareDb } from "../../schema.js";
+import type { PsqlService } from "../../services/psql/PsqlService.js";
 import type { TokenStatsHourlyDbRecord } from "../../storage/databaseTypes.js";
+import type { DocumentsRepository } from "../../storage/documentsRepository.js";
+import type { FragmentsRepository } from "../../storage/fragmentsRepository.js";
+import type { KeyValuesRepository } from "../../storage/keyValuesRepository.js";
+import type { ObservationLogRepository } from "../../storage/observationLogRepository.js";
+import type { UsersRepository } from "../../storage/usersRepository.js";
 import type { TokenStatsFetchOptions } from "../routes/costs/costsRoutes.js";
+import type { RouteAgentCallbacks, RouteTaskCallbacks } from "../routes/routeTypes.js";
 export type AppServerOptions = {
     config: ConfigModule;
+    db: DaycareDb;
     auth: AuthStore;
     commandRegistry: CommandRegistry;
     connectorRegistry: ConnectorRegistry;
     toolResolver: ToolResolver;
     webhooks: Webhooks;
+    users: UsersRepository | null;
+    agentCallbacks: RouteAgentCallbacks | null;
+    eventBus: EngineEventBus | null;
+    skills: ((ctx: Context) => Promise<AgentSkill[]>) | null;
     tasksListActive: (ctx: Context) => Promise<TaskActiveSummary[]>;
+    tasksListAll: (ctx: Context) => Promise<TaskListAllResult>;
+    taskCallbacks: RouteTaskCallbacks | null;
     tokenStatsFetch: (ctx: Context, options: TokenStatsFetchOptions) => Promise<TokenStatsHourlyDbRecord[]>;
+    documents: DocumentsRepository | null;
+    fragments: FragmentsRepository | null;
+    keyValues: KeyValuesRepository | null;
+    psql?: PsqlService | null;
+    observationLog: ObservationLogRepository | null;
+    secrets: {
+        list: (ctx: Context) => Promise<Secret[]>;
+        add: (ctx: Context, secret: Secret) => Promise<void>;
+        remove: (ctx: Context, name: string) => Promise<boolean>;
+    } | null;
+    connectorTargetResolve: (path: AgentPath) => Promise<{
+        connector: string;
+        targetId: string;
+    } | null>;
 };
 /**
  * Runs the Daycare app HTTP server from core runtime settings.
@@ -25,17 +56,34 @@ export type AppServerOptions = {
  */
 export declare class AppServer {
     private readonly config;
+    private readonly db;
     private readonly auth;
     private readonly commandRegistry;
     private readonly connectorRegistry;
     private readonly toolResolver;
     private readonly webhooks;
+    private readonly users;
+    private readonly agentCallbacks;
+    private readonly eventBus;
+    private readonly skills;
     private readonly tasksListActive;
+    private readonly tasksListAll;
+    private readonly taskCallbacks;
     private readonly tokenStatsFetch;
+    private readonly documents;
+    private readonly fragments;
+    private readonly keyValues;
+    private readonly psql;
+    private readonly observationLog;
+    private readonly secrets;
+    private readonly connectorTargetResolve;
     private readonly logger;
     private server;
     private activeSettings;
+    private activeEmailSettings;
     private secretPromise;
+    private emailAuth;
+    private emailConnect;
     constructor(options: AppServerOptions);
     start(): Promise<void>;
     reload(): Promise<void>;
@@ -43,10 +91,17 @@ export declare class AppServer {
     private settingsApply;
     private requestHandle;
     private telegramTokenResolve;
+    private telegramAuthUserIdResolve;
+    private sessionAuthUserIdNormalize;
+    private userIdResolveByTelegramConnectorKey;
     private secretResolve;
+    private emailAuthResolve;
+    private emailConnectResolve;
+    private emailConnectRequest;
     private registerRuntime;
     private shutdown;
     private messageSend;
+    private pathFromConnectorTarget;
     private settingsRequire;
 }
 //# sourceMappingURL=appServer.d.ts.map

package/dist/api/app-server/appServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appServer.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAe7E,MAAM,MAAM,gBAAgB,GAAG;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,SAAS,CAAC;IAChB,eAAe,EAAE,eAAe,CAAC;IACjC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAChE,eAAe,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,sBAAsB,KAAK,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAAC;CAC3G,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,SAAS;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsC;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsC;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;IAEtD,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,cAAc,CAA0C;IAChE,OAAO,CAAC,aAAa,CAAgC;gBAEzC,OAAO,EAAE,gBAAgB;IAW/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAIb,aAAa;YAyCb,aAAa;YAmEb,oBAAoB;YA6BpB,aAAa;IAQ3B,OAAO,CAAC,eAAe;YA+CT,QAAQ;YAeR,WAAW;IAmBzB,OAAO,CAAC,eAAe;CAM1B"}
+{"version":3,"file":"appServer.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appServer.ts"],"names":[],"mappings":"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"}