openmates 0.15.0-alpha.35 → 0.15.0-alpha.37

package/dist/{chunk-CQDCPDZQ.js → chunk-AAMJQMNZ.js}

@@ -1739,13 +1739,6 @@ var OpenMatesWsClient = class {
           });
           return;
         }
-        if (options?.recoveryTurnId && recoveryJobId && aiResponseDone && !postProcessingDone) {
-          if (postProcessingTimer) {
-            clearTimeout(postProcessingTimer);
-            postProcessingTimer = null;
-          }
-          postProcessingDone = true;
-        }
         if (!aiResponseDone || !postProcessingDone) return;
         if (options?.recoveryTurnId && !recoveryJobId) return;
         if (pendingSubChatHandlers.size > 0) return;
@@ -5355,6 +5348,59 @@ var OpenMatesClient = class _OpenMatesClient {
     if (options.teamId !== void 0) return options.teamId;
     return this.getActiveTeamId();
   }
+  async startAccountExport(options = {}) {
+    this.requireSession();
+    const response = await this.http.post("/v1/account-exports", {
+      domains: options.domains,
+      filters: options.filters ?? {},
+      format: options.format ?? "zip",
+      include_advanced_metadata: options.includeAdvancedMetadata === true
+    }, this.getCliRequestHeaders());
+    if (!response.ok) throw new Error(`Account export start failed with HTTP ${response.status}`);
+    return response.data;
+  }
+  async getAccountExport(exportId) {
+    this.requireSession();
+    const response = await this.http.get(`/v1/account-exports/${encodeURIComponent(exportId)}`, this.getCliRequestHeaders());
+    if (!response.ok) throw new Error(`Account export status failed with HTTP ${response.status}`);
+    return response.data;
+  }
+  async getAccountExportManifest(exportId) {
+    this.requireSession();
+    const response = await this.http.get(`/v1/account-exports/${encodeURIComponent(exportId)}/manifest`, this.getCliRequestHeaders());
+    if (!response.ok) throw new Error(`Account export manifest failed with HTTP ${response.status}`);
+    return response.data;
+  }
+  async listAccountExportChunks(exportId) {
+    this.requireSession();
+    const response = await this.http.get(`/v1/account-exports/${encodeURIComponent(exportId)}/chunks`, this.getCliRequestHeaders());
+    if (!response.ok) throw new Error(`Account export chunk list failed with HTTP ${response.status}`);
+    return response.data;
+  }
+  async getAccountExportChunk(exportId, chunkId) {
+    this.requireSession();
+    const response = await this.http.get(`/v1/account-exports/${encodeURIComponent(exportId)}/chunks/${encodeURIComponent(chunkId)}`, this.getCliRequestHeaders());
+    if (!response.ok || !response.data.chunk) throw new Error(`Account export chunk download failed with HTTP ${response.status}`);
+    return response.data.chunk;
+  }
+  async completeAccountExport(exportId) {
+    this.requireSession();
+    const response = await this.http.post(`/v1/account-exports/${encodeURIComponent(exportId)}/complete`, {}, this.getCliRequestHeaders());
+    if (!response.ok) throw new Error(`Account export complete failed with HTTP ${response.status}`);
+    return response.data;
+  }
+  async acceptPartialAccountExport(exportId) {
+    this.requireSession();
+    const response = await this.http.post(`/v1/account-exports/${encodeURIComponent(exportId)}/accept-partial`, {}, this.getCliRequestHeaders());
+    if (!response.ok) throw new Error(`Account export accept partial failed with HTTP ${response.status}`);
+    return response.data;
+  }
+  async cancelAccountExport(exportId) {
+    this.requireSession();
+    const response = await this.http.post(`/v1/account-exports/${encodeURIComponent(exportId)}/cancel`, {}, this.getCliRequestHeaders());
+    if (!response.ok) throw new Error(`Account export cancel failed with HTTP ${response.status}`);
+    return response.data;
+  }
   appendTeamQuery(path, options = {}) {
     const teamId = this.resolveTeamContext(options);
     if (!teamId) return path;
@@ -15869,6 +15915,53 @@ var OpenMatesAccount = class {
   async clearInterests() {
     return this.setInterests([]);
   }
+  async startExport(options = {}) {
+    return this.client.request("/v1/account-exports", {
+      domains: options.domains,
+      filters: options.filters ?? {},
+      format: options.format ?? "zip",
+      include_advanced_metadata: options.includeAdvancedMetadata === true
+    });
+  }
+  async getExport(exportId) {
+    return this.client.get(`/v1/account-exports/${encodeURIComponent(exportId)}`);
+  }
+  async exportJobManifest(exportId) {
+    return this.client.get(`/v1/account-exports/${encodeURIComponent(exportId)}/manifest`);
+  }
+  async exportChunks(exportId) {
+    return this.client.get(`/v1/account-exports/${encodeURIComponent(exportId)}/chunks`);
+  }
+  async exportChunk(exportId, chunkId) {
+    const result = await this.client.get(`/v1/account-exports/${encodeURIComponent(exportId)}/chunks/${encodeURIComponent(chunkId)}`);
+    return result.chunk ?? {};
+  }
+  async *iterExportChunks(exportId) {
+    const listed = await this.exportChunks(exportId);
+    for (const chunk of listed.chunks) {
+      const chunkId = String(chunk.chunk_id ?? "");
+      yield chunkId ? await this.exportChunk(exportId, chunkId) : chunk;
+    }
+  }
+  async completeExport(exportId) {
+    return this.client.request(`/v1/account-exports/${encodeURIComponent(exportId)}/complete`, {});
+  }
+  async acceptPartialExport(exportId) {
+    return this.client.request(`/v1/account-exports/${encodeURIComponent(exportId)}/accept-partial`, {});
+  }
+  async cancelExport(exportId) {
+    return this.client.request(`/v1/account-exports/${encodeURIComponent(exportId)}/cancel`, {});
+  }
+  async downloadExport(options = {}) {
+    const started = await this.startExport(options);
+    const exportId = String(started.export.export_id ?? "");
+    const [manifest, chunks] = await Promise.all([
+      this.exportJobManifest(exportId),
+      this.exportChunks(exportId)
+    ]);
+    const completed = await this.completeExport(exportId);
+    return { export: completed.export, manifest: manifest.manifest, chunks: chunks.chunks };
+  }
   async exportManifest() {
     return this.client.get("/v1/sdk/account/export/manifest");
   }
@@ -59592,6 +59685,10 @@ async function main() {
       printSettingsHelp(client);
       return;
     }
+    if (command === "account") {
+      printSettingsHelp(client, ["account"]);
+      return;
+    }
     if (command === "workflows") {
       printWorkflowsHelp();
       return;
@@ -59754,6 +59851,10 @@ async function main() {
     await handleSettings(client, subcommand, rest, parsed.flags);
     return;
   }
+  if (command === "account") {
+    await handleSettings(client, "account", [subcommand, ...rest].filter((part) => typeof part === "string"), parsed.flags);
+    return;
+  }
   if (command === "workflows") {
     await handleWorkflows(client, subcommand, rest, parsed.flags);
     return;
@@ -62746,8 +62847,12 @@ var SETTINGS_EXECUTABLE_COMMANDS = [
   { path: ["account", "interests", "list"], description: "Show encrypted account topic interests", examples: ["openmates settings account interests list --json"] },
   { path: ["account", "interests", "set"], description: "Set encrypted account topic interests", examples: ["openmates settings account interests set software_development run_code privacy"] },
   { path: ["account", "interests", "clear"], description: "Clear encrypted account topic interests", examples: ["openmates settings account interests clear --yes"] },
-  { path: ["account", "export", "manifest"], description: "Show account export manifest", examples: ["openmates settings account export manifest --json"] },
-  { path: ["account", "export", "data"], description: "Fetch account export data", examples: ["openmates settings account export data --json"] },
+  { path: ["account", "export"], description: "Start a complete Account Export V1 job", examples: ["openmates account export --output ./openmates-export.json", "openmates settings account export --domains chats,usage --json"] },
+  { path: ["account", "export", "start"], description: "Start a complete Account Export V1 job", examples: ["openmates settings account export start --output ./openmates-export.json"] },
+  { path: ["account", "export", "status"], description: "Show account export job status", examples: ["openmates settings account export status <export-id> --json"] },
+  { path: ["account", "export", "manifest"], description: "Show account export manifest", examples: ["openmates settings account export manifest <export-id> --json"] },
+  { path: ["account", "export", "chunks"], description: "List account export chunks", examples: ["openmates settings account export chunks <export-id> --json"] },
+  { path: ["account", "export", "data"], description: "Fetch account export chunks", examples: ["openmates settings account export data <export-id> --json"] },
   { path: ["account", "import-chat"], description: "Import a CLI chat export file", examples: ["openmates settings account import-chat ./chat.yml", "openmates settings account import-chat ./payload.json"] },
   { path: ["account", "username", "set"], description: "Change account username", examples: ["openmates settings account username set alice_123"] },
   { path: ["account", "profile-picture", "set"], description: "Upload a profile picture", examples: ["openmates settings account profile-picture set ./avatar.jpg"] },
@@ -62838,6 +62943,47 @@ async function printSettingsResult(resultPromise, flags) {
     printGenericObject(result);
   }
 }
+function parseCsvFlag(value) {
+  if (typeof value !== "string") return void 0;
+  const items = value.split(",").map((item) => item.trim()).filter(Boolean);
+  return items.length > 0 ? items : void 0;
+}
+async function runAccountExport(client, flags) {
+  const filters = typeof flags.filters === "string" ? parseJsonFlag(flags.filters, "--filters") : {};
+  const started = await client.startAccountExport({
+    domains: parseCsvFlag(flags.domains),
+    filters,
+    format: flags.format === "directory" ? "directory" : "zip",
+    includeAdvancedMetadata: flags["include-advanced-metadata"] === true
+  });
+  const exportRecord = started.export;
+  const exportId = String(exportRecord.export_id ?? "");
+  const [manifest, chunks] = await Promise.all([
+    client.getAccountExportManifest(exportId),
+    client.listAccountExportChunks(exportId)
+  ]);
+  const completed = await client.completeAccountExport(exportId);
+  return {
+    export: completed.export,
+    manifest: manifest.manifest,
+    chunks: chunks.chunks
+  };
+}
+function printAccountExportBundle(bundle, flags) {
+  if (typeof flags.output === "string") {
+    writeFileSync7(flags.output, `${JSON.stringify(bundle, null, 2)}
+`, "utf-8");
+  }
+  if (flags.json === true) {
+    printJson2(typeof flags.output === "string" ? { ...bundle, output: flags.output } : bundle);
+    return;
+  }
+  const exportRecord = bundle.export && typeof bundle.export === "object" ? bundle.export : {};
+  process.stdout.write(`Account export ${String(exportRecord.export_id ?? "")} ${String(exportRecord.status ?? "unknown")}
+`);
+  if (typeof flags.output === "string") process.stdout.write(`Wrote ${flags.output}
+`);
+}
 function printApiKeyList(result, flags) {
   if (flags.json === true) {
     printJson2(result);
@@ -63548,12 +63694,38 @@ async function handleSettings(client, subcommand, rest, flags) {
     printTopicPreferences(preferences, flags, "Interests cleared");
     return;
   }
+  if (matches(tokens, ["account", "export"]) || matches(tokens, ["account", "export", "start"])) {
+    printAccountExportBundle(await runAccountExport(client, flags), flags);
+    return;
+  }
+  if (matches(tokens, ["account", "export", "status"])) {
+    const exportId = rest[2];
+    if (!exportId) throw new Error("Missing export ID. Example: openmates settings account export status <export-id>");
+    await printSettingsResult(client.getAccountExport(exportId), flags);
+    return;
+  }
   if (matches(tokens, ["account", "export", "manifest"])) {
-    await printSettingsResult(client.settingsGet("export-account-manifest"), flags);
+    const exportId = rest[2];
+    if (!exportId) {
+      await printSettingsResult(client.settingsGet("export-account-manifest"), flags);
+      return;
+    }
+    await printSettingsResult(client.getAccountExportManifest(exportId), flags);
+    return;
+  }
+  if (matches(tokens, ["account", "export", "chunks"])) {
+    const exportId = rest[2];
+    if (!exportId) throw new Error("Missing export ID. Example: openmates settings account export chunks <export-id>");
+    await printSettingsResult(client.listAccountExportChunks(exportId), flags);
     return;
   }
   if (matches(tokens, ["account", "export", "data"])) {
-    await printSettingsResult(client.settingsGet("export-account-data"), flags);
+    const exportId = rest[2];
+    if (!exportId) {
+      await printSettingsResult(client.settingsGet("export-account-data"), flags);
+      return;
+    }
+    await printSettingsResult(client.listAccountExportChunks(exportId), flags);
     return;
   }
   if (matches(tokens, ["account", "import-chat"])) {

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   getExtForLang,
   serializeToYaml
-} from "./chunk-CQDCPDZQ.js";
+} from "./chunk-AAMJQMNZ.js";
 import "./chunk-AXNRPVLE.js";
 export {
   getExtForLang,

package/dist/index.d.ts

@@ -478,6 +478,21 @@ interface TeamContextOptions {
     teamId?: string | null;
     personal?: boolean;
 }
+interface AccountExportStartOptions$1 {
+    domains?: string[];
+    filters?: Record<string, unknown>;
+    format?: "zip" | "directory";
+    includeAdvancedMetadata?: boolean;
+}
+interface AccountExportResponse$1 {
+    export: Record<string, unknown>;
+}
+interface AccountExportManifestResponse$1 {
+    manifest: Record<string, unknown>;
+}
+interface AccountExportChunksResponse$1 {
+    chunks: Array<Record<string, unknown>>;
+}
 interface TeamCreateInput {
     name?: string;
     description?: string | null;
@@ -1249,6 +1264,14 @@ declare class OpenMatesClient {
     getActiveTeamId(): string | null;
     setActiveTeamId(teamId: string | null): void;
     resolveTeamContext(options?: TeamContextOptions): string | null;
+    startAccountExport(options?: AccountExportStartOptions$1): Promise<AccountExportResponse$1>;
+    getAccountExport(exportId: string): Promise<AccountExportResponse$1>;
+    getAccountExportManifest(exportId: string): Promise<AccountExportManifestResponse$1>;
+    listAccountExportChunks(exportId: string): Promise<AccountExportChunksResponse$1>;
+    getAccountExportChunk(exportId: string, chunkId: string): Promise<Record<string, unknown>>;
+    completeAccountExport(exportId: string): Promise<AccountExportResponse$1>;
+    acceptPartialAccountExport(exportId: string): Promise<AccountExportResponse$1>;
+    cancelAccountExport(exportId: string): Promise<AccountExportResponse$1>;
     private appendTeamQuery;
     listTeams(): Promise<TeamRecord[]>;
     createTeam(input: TeamCreateInput): Promise<TeamRecord>;
@@ -5136,6 +5159,21 @@ interface ConfirmedMutationOptions {
 interface RequestOptions {
     query?: Record<string, string | number | boolean | undefined | null>;
 }
+interface AccountExportStartOptions {
+    domains?: string[];
+    filters?: Record<string, unknown>;
+    format?: "zip" | "directory";
+    includeAdvancedMetadata?: boolean;
+}
+interface AccountExportResponse {
+    export: Record<string, unknown>;
+}
+interface AccountExportManifestResponse {
+    manifest: Record<string, unknown>;
+}
+interface AccountExportChunksResponse {
+    chunks: Array<Record<string, unknown>>;
+}
 interface ApiKeyCreateOptions {
     name: string;
     fullAccess?: boolean;
@@ -5387,6 +5425,16 @@ declare class OpenMatesAccount {
     listInterests(): Promise<Record<string, unknown>>;
     setInterests(selectedTagIds: string[]): Promise<Record<string, unknown>>;
     clearInterests(): Promise<Record<string, unknown>>;
+    startExport(options?: AccountExportStartOptions): Promise<AccountExportResponse>;
+    getExport(exportId: string): Promise<AccountExportResponse>;
+    exportJobManifest(exportId: string): Promise<AccountExportManifestResponse>;
+    exportChunks(exportId: string): Promise<AccountExportChunksResponse>;
+    exportChunk(exportId: string, chunkId: string): Promise<Record<string, unknown>>;
+    iterExportChunks(exportId: string): AsyncGenerator<Record<string, unknown>>;
+    completeExport(exportId: string): Promise<AccountExportResponse>;
+    acceptPartialExport(exportId: string): Promise<AccountExportResponse>;
+    cancelExport(exportId: string): Promise<AccountExportResponse>;
+    downloadExport(options?: AccountExportStartOptions): Promise<Record<string, unknown>>;
     exportManifest(): Promise<Record<string, unknown>>;
     exportData(): Promise<Record<string, unknown>>;
     setUsername(username: string): Promise<Record<string, unknown>>;

package/dist/index.js

@@ -18,7 +18,7 @@ import {
   reconcileAuthoritativeChats,
   renderSupportInfo,
   serializeToYaml
-} from "./chunk-CQDCPDZQ.js";
+} from "./chunk-AAMJQMNZ.js";
 import "./chunk-AXNRPVLE.js";
 export {
   APP_SKILL_METADATA,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmates",
-  "version": "0.15.0-alpha.35",
+  "version": "0.15.0-alpha.37",
   "description": "OpenMates CLI and SDK",
   "type": "module",
   "main": "dist/index.js",
@@ -30,11 +30,13 @@
     "test:unit:workflows": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/workflows.test.ts",
     "test:unit:sdk-workflows": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/sdk-workflows.test.ts",
     "test:unit:remote-access": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/remoteSources.test.ts tests/remoteAccess.test.ts",
+    "test:unit:teams": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/teams-permissions.test.ts",
     "test:unit:proton-bridge-connector": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/protonBridgeConnector.test.ts",
     "test:unit:proton-bridge-connector-integration": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/protonBridgeConnector.integration.test.ts",
     "test:unit:sdk-projects": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/sdk-projects.test.ts",
     "test:unit:billing": "node --test tests/billing.test.ts",
     "test:unit:account-delete": "node --test tests/account-delete.test.ts",
+    "test:unit:ideabucket": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/ideabucket.test.ts",
     "test:unit:cli": "node --test tests/cli.test.ts",
     "test:t-cli-recovery": "node --test --experimental-strip-types --loader ./tests/loader.mjs --test-name-pattern recovery tests/client.test.ts",
     "test:t-cli-update-required": "npm run build && node --test --test-name-pattern update-required tests/cli.test.ts",
@@ -43,7 +45,7 @@
     "test:unit:tui": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/tui.test.ts tests/tuiExampleContinuation.test.ts tests/tuiWorkflowInteraction.test.ts",
     "test:unit:connected-account-import": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/connectedAccountImport.test.ts",
     "test:unit:benchmark": "node --test --experimental-strip-types --loader ./tests/loader.mjs src/__tests__/benchmark.test.ts",
-    "test": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/crypto.test.ts tests/storage.test.ts tests/keychain.test.ts tests/mentions.test.ts tests/outputRedactor.test.ts tests/fileEmbed.test.ts tests/embedCreator.test.ts tests/shareEncryption.test.ts tests/server.test.ts tests/ws.test.ts tests/urlEmbed.test.ts tests/tui.test.ts tests/tuiExampleContinuation.test.ts tests/tuiWorkflowInteraction.test.ts tests/workflows.test.ts tests/sdk-workflows.test.ts tests/draft-sync.test.ts tests/sdk-draft-sync.test.ts src/__tests__/benchmark.test.ts && node --test --experimental-strip-types --loader ./tests/loader.mjs tests/embedRenderers.test.ts tests/connectedAccountImport.test.ts && node --test tests/cli.test.ts tests/billing.test.ts tests/account-delete.test.ts tests/signup.test.ts tests/security-setup.test.ts tests/e2e-provisioning.test.ts"
+    "test": "node --test --experimental-strip-types --loader ./tests/loader.mjs tests/crypto.test.ts tests/storage.test.ts tests/keychain.test.ts tests/mentions.test.ts tests/outputRedactor.test.ts tests/fileEmbed.test.ts tests/embedCreator.test.ts tests/shareEncryption.test.ts tests/server.test.ts tests/ws.test.ts tests/urlEmbed.test.ts tests/tui.test.ts tests/tuiExampleContinuation.test.ts tests/tuiWorkflowInteraction.test.ts tests/workflows.test.ts tests/sdk-workflows.test.ts tests/draft-sync.test.ts tests/sdk-draft-sync.test.ts tests/ideabucket.test.ts tests/teams-permissions.test.ts src/__tests__/benchmark.test.ts && node --test --experimental-strip-types --loader ./tests/loader.mjs tests/embedRenderers.test.ts tests/connectedAccountImport.test.ts && node --test tests/cli.test.ts tests/billing.test.ts tests/account-delete.test.ts tests/signup.test.ts tests/security-setup.test.ts tests/e2e-provisioning.test.ts"
   },
   "keywords": [
     "openmates",

package/templates/core/docker-compose.selfhost.yml

@@ -185,25 +185,27 @@ services:
     restart: on-failure
 
   task-worker:
-    image: ${OPENMATES_IMAGE_REGISTRY:-ghcr.io/glowingkitty}/openmates-api:${OPENMATES_IMAGE_TAG:-dev}
+    <<: *openmates-worker-base
     container_name: task-worker
-    restart: unless-stopped
     mem_limit: ${TASK_WORKER_MEMORY_LIMIT:-3g}
-    env_file: ../../.env
-    command: python -m celery -A backend.core.api.app.tasks.celery_config worker --loglevel=info --queues=email,user_init,persistence,health_check,server_stats,demo,reminder,push --concurrency=${TASK_WORKER_CONCURRENCY:-3} --max-tasks-per-child=50 --max-memory-per-child=600000 --prefetch-multiplier=1
-    networks: [openmates]
-    depends_on: [api]
+    environment:
+      <<: *openmates-worker-env
+      CELERY_QUEUES: email,user_init,persistence,health_check,server_stats,demo,reminder,push
+      CELERY_AUTOSCALE_MAX: ${TASK_WORKER_CONCURRENCY:-${CELERY_AUTOSCALE_MAX:-3}}
+      CELERY_AUTOSCALE_MIN: ${CELERY_AUTOSCALE_MIN:-1}
+      CELERY_METRICS_PORT: "9101"
+    command: >
+      sh -c "chown -R celeryuser:celeryuser /vault-data && gosu celeryuser python -m celery -A backend.core.api.app.tasks.celery_config worker --loglevel=info --queues=email,user_init,persistence,health_check,server_stats,demo,reminder,push --concurrency=$${CELERY_AUTOSCALE_MAX} --max-tasks-per-child=50 --max-memory-per-child=600000 --prefetch-multiplier=1"
 
   task-scheduler:
-    image: ${OPENMATES_IMAGE_REGISTRY:-ghcr.io/glowingkitty}/openmates-api:${OPENMATES_IMAGE_TAG:-dev}
+    <<: *openmates-worker-base
     container_name: task-scheduler
-    restart: unless-stopped
-    env_file: ../../.env
     command: python -m celery -A backend.core.api.app.tasks.celery_config beat --loglevel=info --schedule=/celerybeat-data/celerybeat-schedule
     volumes:
+      - ../../config:/app_config
+      - vault-setup-data:/vault-data
+      - api-logs:/app/logs
       - celerybeat-schedule-data:/celerybeat-data
-    networks: [openmates]
-    depends_on: [api]
 
   app-ai-worker:
     <<: *openmates-worker-base