@askexenow/exe-os 0.9.7 → 0.9.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/backfill-conversations.js +953 -105
- package/dist/bin/backfill-responses.js +952 -104
- package/dist/bin/backfill-vectors.js +956 -108
- package/dist/bin/cleanup-stale-review-tasks.js +802 -58
- package/dist/bin/cli.js +2292 -1070
- package/dist/bin/exe-agent-config.js +157 -101
- package/dist/bin/exe-agent.js +55 -29
- package/dist/bin/exe-assign.js +940 -92
- package/dist/bin/exe-boot.js +1424 -442
- package/dist/bin/exe-call.js +240 -141
- package/dist/bin/exe-cloud.js +198 -70
- package/dist/bin/exe-dispatch.js +951 -192
- package/dist/bin/exe-doctor.js +791 -51
- package/dist/bin/exe-export-behaviors.js +790 -42
- package/dist/bin/exe-forget.js +771 -31
- package/dist/bin/exe-gateway.js +1592 -521
- package/dist/bin/exe-heartbeat.js +850 -109
- package/dist/bin/exe-kill.js +783 -35
- package/dist/bin/exe-launch-agent.js +1030 -107
- package/dist/bin/exe-link.js +916 -110
- package/dist/bin/exe-new-employee.js +526 -217
- package/dist/bin/exe-pending-messages.js +1046 -62
- package/dist/bin/exe-pending-notifications.js +1318 -111
- package/dist/bin/exe-pending-reviews.js +1040 -72
- package/dist/bin/exe-rename.js +772 -59
- package/dist/bin/exe-review.js +772 -32
- package/dist/bin/exe-search.js +982 -128
- package/dist/bin/exe-session-cleanup.js +1180 -306
- package/dist/bin/exe-settings.js +185 -105
- package/dist/bin/exe-start-codex.js +886 -132
- package/dist/bin/exe-start-opencode.js +873 -119
- package/dist/bin/exe-status.js +803 -59
- package/dist/bin/exe-team.js +772 -32
- package/dist/bin/git-sweep.js +1046 -223
- package/dist/bin/graph-backfill.js +779 -31
- package/dist/bin/graph-export.js +785 -37
- package/dist/bin/install.js +632 -200
- package/dist/bin/scan-tasks.js +1055 -232
- package/dist/bin/setup.js +1419 -320
- package/dist/bin/shard-migrate.js +783 -35
- package/dist/bin/update.js +138 -49
- package/dist/bin/wiki-sync.js +782 -34
- package/dist/gateway/index.js +1444 -449
- package/dist/hooks/bug-report-worker.js +1141 -269
- package/dist/hooks/codex-stop-task-finalizer.js +4678 -0
- package/dist/hooks/commit-complete.js +1044 -221
- package/dist/hooks/error-recall.js +989 -135
- package/dist/hooks/exe-heartbeat-hook.js +99 -75
- package/dist/hooks/ingest-worker.js +4176 -3226
- package/dist/hooks/ingest.js +920 -168
- package/dist/hooks/instructions-loaded.js +874 -70
- package/dist/hooks/notification.js +860 -56
- package/dist/hooks/post-compact.js +881 -73
- package/dist/hooks/pre-compact.js +1050 -227
- package/dist/hooks/pre-tool-use.js +1084 -159
- package/dist/hooks/prompt-ingest-worker.js +1089 -164
- package/dist/hooks/prompt-submit.js +1469 -515
- package/dist/hooks/response-ingest-worker.js +1104 -179
- package/dist/hooks/session-end.js +1085 -251
- package/dist/hooks/session-start.js +1241 -231
- package/dist/hooks/stop.js +935 -109
- package/dist/hooks/subagent-stop.js +881 -73
- package/dist/hooks/summary-worker.js +1323 -307
- package/dist/index.js +1449 -452
- package/dist/lib/agent-config.js +28 -6
- package/dist/lib/cloud-sync.js +909 -115
- package/dist/lib/config.js +30 -10
- package/dist/lib/consolidation.js +42 -9
- package/dist/lib/database.js +739 -33
- package/dist/lib/db-daemon-client.js +73 -19
- package/dist/lib/db.js +2359 -0
- package/dist/lib/device-registry.js +760 -47
- package/dist/lib/embedder.js +201 -73
- package/dist/lib/employee-templates.js +30 -4
- package/dist/lib/employees.js +290 -86
- package/dist/lib/exe-daemon-client.js +187 -83
- package/dist/lib/exe-daemon.js +1696 -616
- package/dist/lib/hybrid-search.js +982 -128
- package/dist/lib/identity.js +43 -13
- package/dist/lib/license.js +133 -48
- package/dist/lib/messaging.js +167 -80
- package/dist/lib/reminders.js +35 -5
- package/dist/lib/schedules.js +772 -32
- package/dist/lib/skill-learning.js +54 -7
- package/dist/lib/store.js +779 -31
- package/dist/lib/task-router.js +94 -73
- package/dist/lib/tasks.js +298 -225
- package/dist/lib/tmux-routing.js +246 -172
- package/dist/lib/token-spend.js +52 -14
- package/dist/mcp/server.js +2893 -850
- package/dist/mcp/tools/complete-reminder.js +35 -5
- package/dist/mcp/tools/create-reminder.js +35 -5
- package/dist/mcp/tools/create-task.js +507 -323
- package/dist/mcp/tools/deactivate-behavior.js +40 -10
- package/dist/mcp/tools/list-reminders.js +35 -5
- package/dist/mcp/tools/list-tasks.js +277 -104
- package/dist/mcp/tools/send-message.js +129 -56
- package/dist/mcp/tools/update-task.js +1864 -188
- package/dist/runtime/index.js +1083 -259
- package/dist/tui/App.js +1501 -434
- package/package.json +3 -2
|
@@ -75,9 +75,34 @@ var init_db_retry = __esm({
|
|
|
75
75
|
}
|
|
76
76
|
});
|
|
77
77
|
|
|
78
|
+
// src/lib/secure-files.ts
|
|
79
|
+
import { chmodSync, existsSync, mkdirSync } from "fs";
|
|
80
|
+
import { chmod, mkdir } from "fs/promises";
|
|
81
|
+
async function ensurePrivateDir(dirPath) {
|
|
82
|
+
await mkdir(dirPath, { recursive: true, mode: PRIVATE_DIR_MODE });
|
|
83
|
+
try {
|
|
84
|
+
await chmod(dirPath, PRIVATE_DIR_MODE);
|
|
85
|
+
} catch {
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
async function enforcePrivateFile(filePath) {
|
|
89
|
+
try {
|
|
90
|
+
await chmod(filePath, PRIVATE_FILE_MODE);
|
|
91
|
+
} catch {
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
var PRIVATE_DIR_MODE, PRIVATE_FILE_MODE;
|
|
95
|
+
var init_secure_files = __esm({
|
|
96
|
+
"src/lib/secure-files.ts"() {
|
|
97
|
+
"use strict";
|
|
98
|
+
PRIVATE_DIR_MODE = 448;
|
|
99
|
+
PRIVATE_FILE_MODE = 384;
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
|
|
78
103
|
// src/lib/config.ts
|
|
79
|
-
import { readFile, writeFile
|
|
80
|
-
import { readFileSync, existsSync, renameSync } from "fs";
|
|
104
|
+
import { readFile, writeFile } from "fs/promises";
|
|
105
|
+
import { readFileSync, existsSync as existsSync2, renameSync } from "fs";
|
|
81
106
|
import path from "path";
|
|
82
107
|
import os from "os";
|
|
83
108
|
function resolveDataDir() {
|
|
@@ -85,7 +110,7 @@ function resolveDataDir() {
|
|
|
85
110
|
if (process.env.EXE_MEM_DIR) return process.env.EXE_MEM_DIR;
|
|
86
111
|
const newDir = path.join(os.homedir(), ".exe-os");
|
|
87
112
|
const legacyDir = path.join(os.homedir(), ".exe-mem");
|
|
88
|
-
if (!
|
|
113
|
+
if (!existsSync2(newDir) && existsSync2(legacyDir)) {
|
|
89
114
|
try {
|
|
90
115
|
renameSync(legacyDir, newDir);
|
|
91
116
|
process.stderr.write(`[exe-os] Migrated data directory: ~/.exe-mem \u2192 ~/.exe-os
|
|
@@ -148,9 +173,9 @@ function normalizeAutoUpdate(raw) {
|
|
|
148
173
|
}
|
|
149
174
|
async function loadConfig() {
|
|
150
175
|
const dir = process.env.EXE_OS_DIR ?? process.env.EXE_MEM_DIR ?? EXE_AI_DIR;
|
|
151
|
-
await
|
|
176
|
+
await ensurePrivateDir(dir);
|
|
152
177
|
const configPath = path.join(dir, "config.json");
|
|
153
|
-
if (!
|
|
178
|
+
if (!existsSync2(configPath)) {
|
|
154
179
|
return { ...DEFAULT_CONFIG, dbPath: path.join(dir, "memories.db") };
|
|
155
180
|
}
|
|
156
181
|
const raw = await readFile(configPath, "utf-8");
|
|
@@ -163,6 +188,7 @@ async function loadConfig() {
|
|
|
163
188
|
`);
|
|
164
189
|
try {
|
|
165
190
|
await writeFile(configPath, JSON.stringify(migratedCfg, null, 2) + "\n");
|
|
191
|
+
await enforcePrivateFile(configPath);
|
|
166
192
|
} catch {
|
|
167
193
|
}
|
|
168
194
|
}
|
|
@@ -182,6 +208,7 @@ var EXE_AI_DIR, DB_PATH, MODELS_DIR, CONFIG_PATH, LEGACY_LANCE_PATH, CURRENT_CON
|
|
|
182
208
|
var init_config = __esm({
|
|
183
209
|
"src/lib/config.ts"() {
|
|
184
210
|
"use strict";
|
|
211
|
+
init_secure_files();
|
|
185
212
|
EXE_AI_DIR = resolveDataDir();
|
|
186
213
|
DB_PATH = path.join(EXE_AI_DIR, "memories.db");
|
|
187
214
|
MODELS_DIR = path.join(EXE_AI_DIR, "models");
|
|
@@ -260,7 +287,7 @@ var init_config = __esm({
|
|
|
260
287
|
|
|
261
288
|
// src/lib/employees.ts
|
|
262
289
|
import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
|
|
263
|
-
import { existsSync as
|
|
290
|
+
import { existsSync as existsSync3, symlinkSync, readlinkSync, readFileSync as readFileSync2, renameSync as renameSync2, unlinkSync, writeFileSync } from "fs";
|
|
264
291
|
import { execSync } from "child_process";
|
|
265
292
|
import path2 from "path";
|
|
266
293
|
import os2 from "os";
|
|
@@ -277,14 +304,14 @@ function getCoordinatorName(employees = loadEmployeesSync()) {
|
|
|
277
304
|
return getCoordinatorEmployee(employees)?.name ?? DEFAULT_COORDINATOR_TEMPLATE_NAME;
|
|
278
305
|
}
|
|
279
306
|
function loadEmployeesSync(employeesPath = EMPLOYEES_PATH) {
|
|
280
|
-
if (!
|
|
307
|
+
if (!existsSync3(employeesPath)) return [];
|
|
281
308
|
try {
|
|
282
309
|
return JSON.parse(readFileSync2(employeesPath, "utf-8"));
|
|
283
310
|
} catch {
|
|
284
311
|
return [];
|
|
285
312
|
}
|
|
286
313
|
}
|
|
287
|
-
var EMPLOYEES_PATH, DEFAULT_COORDINATOR_TEMPLATE_NAME, COORDINATOR_ROLE;
|
|
314
|
+
var EMPLOYEES_PATH, DEFAULT_COORDINATOR_TEMPLATE_NAME, COORDINATOR_ROLE, IDENTITY_DIR;
|
|
288
315
|
var init_employees = __esm({
|
|
289
316
|
"src/lib/employees.ts"() {
|
|
290
317
|
"use strict";
|
|
@@ -292,12 +319,609 @@ var init_employees = __esm({
|
|
|
292
319
|
EMPLOYEES_PATH = path2.join(EXE_AI_DIR, "exe-employees.json");
|
|
293
320
|
DEFAULT_COORDINATOR_TEMPLATE_NAME = "exe";
|
|
294
321
|
COORDINATOR_ROLE = "COO";
|
|
322
|
+
IDENTITY_DIR = path2.join(EXE_AI_DIR, "identity");
|
|
323
|
+
}
|
|
324
|
+
});
|
|
325
|
+
|
|
326
|
+
// src/lib/database-adapter.ts
|
|
327
|
+
import os3 from "os";
|
|
328
|
+
import path3 from "path";
|
|
329
|
+
import { createRequire } from "module";
|
|
330
|
+
import { pathToFileURL } from "url";
|
|
331
|
+
function quotedIdentifier(identifier) {
|
|
332
|
+
return `"${identifier.replace(/"/g, '""')}"`;
|
|
333
|
+
}
|
|
334
|
+
function unqualifiedTableName(name) {
|
|
335
|
+
const raw = name.trim().replace(/^"|"$/g, "");
|
|
336
|
+
const parts = raw.split(".");
|
|
337
|
+
return parts[parts.length - 1].replace(/^"|"$/g, "").toLowerCase();
|
|
338
|
+
}
|
|
339
|
+
function stripTrailingSemicolon(sql) {
|
|
340
|
+
return sql.trim().replace(/;+\s*$/u, "");
|
|
341
|
+
}
|
|
342
|
+
function appendClause(sql, clause) {
|
|
343
|
+
const trimmed = stripTrailingSemicolon(sql);
|
|
344
|
+
const returningMatch = /\sRETURNING\b[\s\S]*$/iu.exec(trimmed);
|
|
345
|
+
if (!returningMatch) {
|
|
346
|
+
return `${trimmed}${clause}`;
|
|
347
|
+
}
|
|
348
|
+
const idx = returningMatch.index;
|
|
349
|
+
return `${trimmed.slice(0, idx)}${clause}${trimmed.slice(idx)}`;
|
|
350
|
+
}
|
|
351
|
+
function normalizeStatement(stmt) {
|
|
352
|
+
if (typeof stmt === "string") {
|
|
353
|
+
return { kind: "positional", sql: stmt, args: [] };
|
|
354
|
+
}
|
|
355
|
+
const sql = stmt.sql;
|
|
356
|
+
if (Array.isArray(stmt.args) || stmt.args === void 0) {
|
|
357
|
+
return { kind: "positional", sql, args: stmt.args ?? [] };
|
|
358
|
+
}
|
|
359
|
+
return { kind: "named", sql, args: stmt.args };
|
|
360
|
+
}
|
|
361
|
+
function rewriteBooleanLiterals(sql) {
|
|
362
|
+
let out = sql;
|
|
363
|
+
for (const column of BOOLEAN_COLUMN_NAMES) {
|
|
364
|
+
const scoped = `((?:\\b[a-z_][a-z0-9_]*\\.)?${column})`;
|
|
365
|
+
out = out.replace(new RegExp(`${scoped}\\s*=\\s*0\\b`, "giu"), "$1 = FALSE");
|
|
366
|
+
out = out.replace(new RegExp(`${scoped}\\s*=\\s*1\\b`, "giu"), "$1 = TRUE");
|
|
367
|
+
out = out.replace(new RegExp(`${scoped}\\s*!=\\s*0\\b`, "giu"), "$1 != FALSE");
|
|
368
|
+
out = out.replace(new RegExp(`${scoped}\\s*!=\\s*1\\b`, "giu"), "$1 != TRUE");
|
|
369
|
+
out = out.replace(new RegExp(`${scoped}\\s*<>\\s*0\\b`, "giu"), "$1 <> FALSE");
|
|
370
|
+
out = out.replace(new RegExp(`${scoped}\\s*<>\\s*1\\b`, "giu"), "$1 <> TRUE");
|
|
371
|
+
}
|
|
372
|
+
return out;
|
|
373
|
+
}
|
|
374
|
+
function rewriteInsertOrIgnore(sql) {
|
|
375
|
+
if (!/^\s*INSERT\s+OR\s+IGNORE\s+INTO\b/iu.test(sql)) {
|
|
376
|
+
return sql;
|
|
377
|
+
}
|
|
378
|
+
const replaced = sql.replace(/^\s*INSERT\s+OR\s+IGNORE\s+INTO\b/iu, "INSERT INTO");
|
|
379
|
+
return /\bON\s+CONFLICT\b/iu.test(replaced) ? replaced : appendClause(replaced, " ON CONFLICT DO NOTHING");
|
|
380
|
+
}
|
|
381
|
+
function rewriteInsertOrReplace(sql) {
|
|
382
|
+
const match = /^\s*INSERT\s+OR\s+REPLACE\s+INTO\s+([A-Za-z0-9_."]+)\s*\(([^)]+)\)([\s\S]*)$/iu.exec(sql);
|
|
383
|
+
if (!match) {
|
|
384
|
+
return sql;
|
|
385
|
+
}
|
|
386
|
+
const rawTable = match[1];
|
|
387
|
+
const rawColumns = match[2];
|
|
388
|
+
const remainder = match[3];
|
|
389
|
+
const tableName = unqualifiedTableName(rawTable);
|
|
390
|
+
const conflictKeys = UPSERT_KEYS[tableName];
|
|
391
|
+
if (!conflictKeys?.length) {
|
|
392
|
+
return sql;
|
|
393
|
+
}
|
|
394
|
+
const columns = rawColumns.split(",").map((col) => col.trim().replace(/^"|"$/g, ""));
|
|
395
|
+
const updateColumns = columns.filter((col) => !conflictKeys.includes(col));
|
|
396
|
+
const conflictTarget = conflictKeys.map(quotedIdentifier).join(", ");
|
|
397
|
+
const updateClause = updateColumns.length === 0 ? " DO NOTHING" : ` DO UPDATE SET ${updateColumns.map((col) => `${quotedIdentifier(col)} = EXCLUDED.${quotedIdentifier(col)}`).join(", ")}`;
|
|
398
|
+
return `INSERT INTO ${rawTable} (${rawColumns})${appendClause(remainder, ` ON CONFLICT (${conflictTarget})${updateClause}`)}`;
|
|
399
|
+
}
|
|
400
|
+
function rewriteSql(sql) {
|
|
401
|
+
let out = sql;
|
|
402
|
+
out = out.replace(/\bdatetime\(\s*['"]now['"]\s*\)/giu, "CURRENT_TIMESTAMP");
|
|
403
|
+
out = out.replace(/\bvector32\s*\(\s*\?\s*\)/giu, "?");
|
|
404
|
+
out = rewriteBooleanLiterals(out);
|
|
405
|
+
out = rewriteInsertOrReplace(out);
|
|
406
|
+
out = rewriteInsertOrIgnore(out);
|
|
407
|
+
return stripTrailingSemicolon(out);
|
|
408
|
+
}
|
|
409
|
+
function toBoolean(value) {
|
|
410
|
+
if (value === null || value === void 0) return value;
|
|
411
|
+
if (typeof value === "boolean") return value;
|
|
412
|
+
if (typeof value === "number") return value !== 0;
|
|
413
|
+
if (typeof value === "bigint") return value !== 0n;
|
|
414
|
+
if (typeof value === "string") {
|
|
415
|
+
const normalized = value.trim().toLowerCase();
|
|
416
|
+
if (normalized === "0" || normalized === "false") return false;
|
|
417
|
+
if (normalized === "1" || normalized === "true") return true;
|
|
418
|
+
}
|
|
419
|
+
return Boolean(value);
|
|
420
|
+
}
|
|
421
|
+
function countQuestionMarks(sql, end) {
|
|
422
|
+
let count = 0;
|
|
423
|
+
let inSingle = false;
|
|
424
|
+
let inDouble = false;
|
|
425
|
+
let inLineComment = false;
|
|
426
|
+
let inBlockComment = false;
|
|
427
|
+
for (let i = 0; i < end; i++) {
|
|
428
|
+
const ch = sql[i];
|
|
429
|
+
const next = sql[i + 1];
|
|
430
|
+
if (inLineComment) {
|
|
431
|
+
if (ch === "\n") inLineComment = false;
|
|
432
|
+
continue;
|
|
433
|
+
}
|
|
434
|
+
if (inBlockComment) {
|
|
435
|
+
if (ch === "*" && next === "/") {
|
|
436
|
+
inBlockComment = false;
|
|
437
|
+
i += 1;
|
|
438
|
+
}
|
|
439
|
+
continue;
|
|
440
|
+
}
|
|
441
|
+
if (!inSingle && !inDouble && ch === "-" && next === "-") {
|
|
442
|
+
inLineComment = true;
|
|
443
|
+
i += 1;
|
|
444
|
+
continue;
|
|
445
|
+
}
|
|
446
|
+
if (!inSingle && !inDouble && ch === "/" && next === "*") {
|
|
447
|
+
inBlockComment = true;
|
|
448
|
+
i += 1;
|
|
449
|
+
continue;
|
|
450
|
+
}
|
|
451
|
+
if (!inDouble && ch === "'" && sql[i - 1] !== "\\") {
|
|
452
|
+
inSingle = !inSingle;
|
|
453
|
+
continue;
|
|
454
|
+
}
|
|
455
|
+
if (!inSingle && ch === '"' && sql[i - 1] !== "\\") {
|
|
456
|
+
inDouble = !inDouble;
|
|
457
|
+
continue;
|
|
458
|
+
}
|
|
459
|
+
if (!inSingle && !inDouble && ch === "?") {
|
|
460
|
+
count += 1;
|
|
461
|
+
}
|
|
462
|
+
}
|
|
463
|
+
return count;
|
|
464
|
+
}
|
|
465
|
+
function findBooleanPlaceholderIndexes(sql) {
|
|
466
|
+
const indexes = /* @__PURE__ */ new Set();
|
|
467
|
+
for (const column of BOOLEAN_COLUMN_NAMES) {
|
|
468
|
+
const pattern = new RegExp(`(?:\\b[a-z_][a-z0-9_]*\\.)?${column}\\s*=\\s*\\?`, "giu");
|
|
469
|
+
for (const match of sql.matchAll(pattern)) {
|
|
470
|
+
const matchText = match[0];
|
|
471
|
+
const qIndex = match.index + matchText.lastIndexOf("?");
|
|
472
|
+
indexes.add(countQuestionMarks(sql, qIndex + 1));
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
return indexes;
|
|
476
|
+
}
|
|
477
|
+
function coerceInsertBooleanArgs(sql, args) {
|
|
478
|
+
const match = /^\s*INSERT(?:\s+OR\s+(?:IGNORE|REPLACE))?\s+INTO\s+([A-Za-z0-9_."]+)\s*\(([^)]+)\)/iu.exec(sql);
|
|
479
|
+
if (!match) return;
|
|
480
|
+
const rawTable = match[1];
|
|
481
|
+
const rawColumns = match[2];
|
|
482
|
+
const boolColumns = BOOLEAN_COLUMNS_BY_TABLE[unqualifiedTableName(rawTable)];
|
|
483
|
+
if (!boolColumns?.size) return;
|
|
484
|
+
const columns = rawColumns.split(",").map((col) => col.trim().replace(/^"|"$/g, ""));
|
|
485
|
+
for (const [index, column] of columns.entries()) {
|
|
486
|
+
if (boolColumns.has(column) && index < args.length) {
|
|
487
|
+
args[index] = toBoolean(args[index]);
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
}
|
|
491
|
+
function coerceUpdateBooleanArgs(sql, args) {
|
|
492
|
+
const match = /^\s*UPDATE\s+([A-Za-z0-9_."]+)\s+SET\s+([\s\S]+?)(?:\s+WHERE\b|$)/iu.exec(sql);
|
|
493
|
+
if (!match) return;
|
|
494
|
+
const rawTable = match[1];
|
|
495
|
+
const setClause = match[2];
|
|
496
|
+
const boolColumns = BOOLEAN_COLUMNS_BY_TABLE[unqualifiedTableName(rawTable)];
|
|
497
|
+
if (!boolColumns?.size) return;
|
|
498
|
+
const assignments = setClause.split(",");
|
|
499
|
+
let placeholderIndex = 0;
|
|
500
|
+
for (const assignment of assignments) {
|
|
501
|
+
if (!assignment.includes("?")) continue;
|
|
502
|
+
placeholderIndex += 1;
|
|
503
|
+
const colMatch = /^\s*(?:[A-Za-z_][A-Za-z0-9_]*\.)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*\?/iu.exec(assignment);
|
|
504
|
+
if (colMatch && boolColumns.has(colMatch[1])) {
|
|
505
|
+
args[placeholderIndex - 1] = toBoolean(args[placeholderIndex - 1]);
|
|
506
|
+
}
|
|
507
|
+
}
|
|
508
|
+
}
|
|
509
|
+
function coerceBooleanArgs(sql, args) {
|
|
510
|
+
const nextArgs = [...args];
|
|
511
|
+
coerceInsertBooleanArgs(sql, nextArgs);
|
|
512
|
+
coerceUpdateBooleanArgs(sql, nextArgs);
|
|
513
|
+
const placeholderIndexes = findBooleanPlaceholderIndexes(sql);
|
|
514
|
+
for (const index of placeholderIndexes) {
|
|
515
|
+
if (index > 0 && index <= nextArgs.length) {
|
|
516
|
+
nextArgs[index - 1] = toBoolean(nextArgs[index - 1]);
|
|
517
|
+
}
|
|
518
|
+
}
|
|
519
|
+
return nextArgs;
|
|
520
|
+
}
|
|
521
|
+
function convertQuestionMarksToDollarParams(sql) {
|
|
522
|
+
let out = "";
|
|
523
|
+
let placeholder = 0;
|
|
524
|
+
let inSingle = false;
|
|
525
|
+
let inDouble = false;
|
|
526
|
+
let inLineComment = false;
|
|
527
|
+
let inBlockComment = false;
|
|
528
|
+
for (let i = 0; i < sql.length; i++) {
|
|
529
|
+
const ch = sql[i];
|
|
530
|
+
const next = sql[i + 1];
|
|
531
|
+
if (inLineComment) {
|
|
532
|
+
out += ch;
|
|
533
|
+
if (ch === "\n") inLineComment = false;
|
|
534
|
+
continue;
|
|
535
|
+
}
|
|
536
|
+
if (inBlockComment) {
|
|
537
|
+
out += ch;
|
|
538
|
+
if (ch === "*" && next === "/") {
|
|
539
|
+
out += next;
|
|
540
|
+
inBlockComment = false;
|
|
541
|
+
i += 1;
|
|
542
|
+
}
|
|
543
|
+
continue;
|
|
544
|
+
}
|
|
545
|
+
if (!inSingle && !inDouble && ch === "-" && next === "-") {
|
|
546
|
+
out += ch + next;
|
|
547
|
+
inLineComment = true;
|
|
548
|
+
i += 1;
|
|
549
|
+
continue;
|
|
550
|
+
}
|
|
551
|
+
if (!inSingle && !inDouble && ch === "/" && next === "*") {
|
|
552
|
+
out += ch + next;
|
|
553
|
+
inBlockComment = true;
|
|
554
|
+
i += 1;
|
|
555
|
+
continue;
|
|
556
|
+
}
|
|
557
|
+
if (!inDouble && ch === "'" && sql[i - 1] !== "\\") {
|
|
558
|
+
inSingle = !inSingle;
|
|
559
|
+
out += ch;
|
|
560
|
+
continue;
|
|
561
|
+
}
|
|
562
|
+
if (!inSingle && ch === '"' && sql[i - 1] !== "\\") {
|
|
563
|
+
inDouble = !inDouble;
|
|
564
|
+
out += ch;
|
|
565
|
+
continue;
|
|
566
|
+
}
|
|
567
|
+
if (!inSingle && !inDouble && ch === "?") {
|
|
568
|
+
placeholder += 1;
|
|
569
|
+
out += `$${placeholder}`;
|
|
570
|
+
continue;
|
|
571
|
+
}
|
|
572
|
+
out += ch;
|
|
573
|
+
}
|
|
574
|
+
return out;
|
|
575
|
+
}
|
|
576
|
+
function translateStatementForPostgres(stmt) {
|
|
577
|
+
const normalized = normalizeStatement(stmt);
|
|
578
|
+
if (normalized.kind === "named") {
|
|
579
|
+
throw new Error("Named SQL parameters are not supported by the Prisma adapter.");
|
|
580
|
+
}
|
|
581
|
+
const rewrittenSql = rewriteSql(normalized.sql);
|
|
582
|
+
const coercedArgs = coerceBooleanArgs(rewrittenSql, normalized.args);
|
|
583
|
+
return {
|
|
584
|
+
sql: convertQuestionMarksToDollarParams(rewrittenSql),
|
|
585
|
+
args: coercedArgs
|
|
586
|
+
};
|
|
587
|
+
}
|
|
588
|
+
function shouldBypassPostgres(stmt) {
|
|
589
|
+
const normalized = normalizeStatement(stmt);
|
|
590
|
+
if (normalized.kind === "named") {
|
|
591
|
+
return true;
|
|
592
|
+
}
|
|
593
|
+
return IMMEDIATE_FALLBACK_PATTERNS.some((pattern) => pattern.test(normalized.sql));
|
|
594
|
+
}
|
|
595
|
+
function shouldFallbackOnError(error) {
|
|
596
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
597
|
+
return /42P01|42883|42601|does not exist|syntax error|not supported|Named SQL parameters are not supported/iu.test(message);
|
|
598
|
+
}
|
|
599
|
+
function isReadQuery(sql) {
|
|
600
|
+
const trimmed = sql.trimStart();
|
|
601
|
+
return /^(SELECT|WITH|SHOW|EXPLAIN|VALUES)\b/iu.test(trimmed) || /\bRETURNING\b/iu.test(trimmed);
|
|
602
|
+
}
|
|
603
|
+
function buildRow(row, columns) {
|
|
604
|
+
const values = columns.map((column) => row[column]);
|
|
605
|
+
return Object.assign(values, row);
|
|
606
|
+
}
|
|
607
|
+
function buildResultSet(rows, rowsAffected = 0) {
|
|
608
|
+
const columns = rows[0] ? Object.keys(rows[0]) : [];
|
|
609
|
+
const resultRows = rows.map((row) => buildRow(row, columns));
|
|
610
|
+
return {
|
|
611
|
+
columns,
|
|
612
|
+
columnTypes: columns.map(() => ""),
|
|
613
|
+
rows: resultRows,
|
|
614
|
+
rowsAffected,
|
|
615
|
+
lastInsertRowid: void 0,
|
|
616
|
+
toJSON() {
|
|
617
|
+
return {
|
|
618
|
+
columns,
|
|
619
|
+
columnTypes: columns.map(() => ""),
|
|
620
|
+
rows,
|
|
621
|
+
rowsAffected,
|
|
622
|
+
lastInsertRowid: void 0
|
|
623
|
+
};
|
|
624
|
+
}
|
|
625
|
+
};
|
|
626
|
+
}
|
|
627
|
+
async function loadPrismaClient() {
|
|
628
|
+
if (!prismaClientPromise) {
|
|
629
|
+
prismaClientPromise = (async () => {
|
|
630
|
+
const explicitPath = process.env.EXE_OS_PRISMA_CLIENT_PATH;
|
|
631
|
+
if (explicitPath) {
|
|
632
|
+
const module2 = await import(pathToFileURL(explicitPath).href);
|
|
633
|
+
const PrismaClient2 = module2.PrismaClient ?? module2.default?.PrismaClient;
|
|
634
|
+
if (!PrismaClient2) {
|
|
635
|
+
throw new Error(`No PrismaClient export found at ${explicitPath}`);
|
|
636
|
+
}
|
|
637
|
+
return new PrismaClient2();
|
|
638
|
+
}
|
|
639
|
+
const exeDbRoot = process.env.EXE_DB_ROOT ?? path3.join(os3.homedir(), "exe-db");
|
|
640
|
+
const requireFromExeDb = createRequire(path3.join(exeDbRoot, "package.json"));
|
|
641
|
+
const prismaEntry = requireFromExeDb.resolve("@prisma/client");
|
|
642
|
+
const module = await import(pathToFileURL(prismaEntry).href);
|
|
643
|
+
const PrismaClient = module.PrismaClient ?? module.default?.PrismaClient;
|
|
644
|
+
if (!PrismaClient) {
|
|
645
|
+
throw new Error(`No PrismaClient export found in ${prismaEntry}`);
|
|
646
|
+
}
|
|
647
|
+
return new PrismaClient();
|
|
648
|
+
})();
|
|
649
|
+
}
|
|
650
|
+
return prismaClientPromise;
|
|
651
|
+
}
|
|
652
|
+
async function ensureCompatibilityViews(prisma) {
|
|
653
|
+
if (!compatibilityBootstrapPromise) {
|
|
654
|
+
compatibilityBootstrapPromise = (async () => {
|
|
655
|
+
for (const mapping of VIEW_MAPPINGS) {
|
|
656
|
+
const relation = mapping.source.replace(/"/g, "");
|
|
657
|
+
const rows = await prisma.$queryRawUnsafe(
|
|
658
|
+
"SELECT to_regclass($1) AS regclass",
|
|
659
|
+
relation
|
|
660
|
+
);
|
|
661
|
+
if (!rows[0]?.regclass) {
|
|
662
|
+
continue;
|
|
663
|
+
}
|
|
664
|
+
await prisma.$executeRawUnsafe(
|
|
665
|
+
`CREATE OR REPLACE VIEW public.${quotedIdentifier(mapping.view)} AS SELECT * FROM ${mapping.source}`
|
|
666
|
+
);
|
|
667
|
+
}
|
|
668
|
+
})();
|
|
669
|
+
}
|
|
670
|
+
return compatibilityBootstrapPromise;
|
|
671
|
+
}
|
|
672
|
+
async function executeOnPrisma(executor, stmt) {
|
|
673
|
+
const translated = translateStatementForPostgres(stmt);
|
|
674
|
+
if (isReadQuery(translated.sql)) {
|
|
675
|
+
const rows = await executor.$queryRawUnsafe(
|
|
676
|
+
translated.sql,
|
|
677
|
+
...translated.args
|
|
678
|
+
);
|
|
679
|
+
return buildResultSet(rows, /\bRETURNING\b/iu.test(translated.sql) ? rows.length : 0);
|
|
680
|
+
}
|
|
681
|
+
const rowsAffected = await executor.$executeRawUnsafe(translated.sql, ...translated.args);
|
|
682
|
+
return buildResultSet([], rowsAffected);
|
|
683
|
+
}
|
|
684
|
+
function splitSqlStatements(sql) {
|
|
685
|
+
const parts = [];
|
|
686
|
+
let current = "";
|
|
687
|
+
let inSingle = false;
|
|
688
|
+
let inDouble = false;
|
|
689
|
+
let inLineComment = false;
|
|
690
|
+
let inBlockComment = false;
|
|
691
|
+
for (let i = 0; i < sql.length; i++) {
|
|
692
|
+
const ch = sql[i];
|
|
693
|
+
const next = sql[i + 1];
|
|
694
|
+
if (inLineComment) {
|
|
695
|
+
current += ch;
|
|
696
|
+
if (ch === "\n") inLineComment = false;
|
|
697
|
+
continue;
|
|
698
|
+
}
|
|
699
|
+
if (inBlockComment) {
|
|
700
|
+
current += ch;
|
|
701
|
+
if (ch === "*" && next === "/") {
|
|
702
|
+
current += next;
|
|
703
|
+
inBlockComment = false;
|
|
704
|
+
i += 1;
|
|
705
|
+
}
|
|
706
|
+
continue;
|
|
707
|
+
}
|
|
708
|
+
if (!inSingle && !inDouble && ch === "-" && next === "-") {
|
|
709
|
+
current += ch + next;
|
|
710
|
+
inLineComment = true;
|
|
711
|
+
i += 1;
|
|
712
|
+
continue;
|
|
713
|
+
}
|
|
714
|
+
if (!inSingle && !inDouble && ch === "/" && next === "*") {
|
|
715
|
+
current += ch + next;
|
|
716
|
+
inBlockComment = true;
|
|
717
|
+
i += 1;
|
|
718
|
+
continue;
|
|
719
|
+
}
|
|
720
|
+
if (!inDouble && ch === "'" && sql[i - 1] !== "\\") {
|
|
721
|
+
inSingle = !inSingle;
|
|
722
|
+
current += ch;
|
|
723
|
+
continue;
|
|
724
|
+
}
|
|
725
|
+
if (!inSingle && ch === '"' && sql[i - 1] !== "\\") {
|
|
726
|
+
inDouble = !inDouble;
|
|
727
|
+
current += ch;
|
|
728
|
+
continue;
|
|
729
|
+
}
|
|
730
|
+
if (!inSingle && !inDouble && ch === ";") {
|
|
731
|
+
if (current.trim()) {
|
|
732
|
+
parts.push(current.trim());
|
|
733
|
+
}
|
|
734
|
+
current = "";
|
|
735
|
+
continue;
|
|
736
|
+
}
|
|
737
|
+
current += ch;
|
|
738
|
+
}
|
|
739
|
+
if (current.trim()) {
|
|
740
|
+
parts.push(current.trim());
|
|
741
|
+
}
|
|
742
|
+
return parts;
|
|
743
|
+
}
|
|
744
|
+
async function createPrismaDbAdapter(fallbackClient) {
|
|
745
|
+
const prisma = await loadPrismaClient();
|
|
746
|
+
await ensureCompatibilityViews(prisma);
|
|
747
|
+
let closed = false;
|
|
748
|
+
let adapter;
|
|
749
|
+
const fallbackExecute = async (stmt, error) => {
|
|
750
|
+
if (!fallbackClient) {
|
|
751
|
+
if (error) throw error;
|
|
752
|
+
throw new Error("No fallback SQLite client is available for this Prisma-routed query.");
|
|
753
|
+
}
|
|
754
|
+
if (error) {
|
|
755
|
+
process.stderr.write(
|
|
756
|
+
`[database-adapter] Falling back to SQLite: ${error instanceof Error ? error.message : String(error)}
|
|
757
|
+
`
|
|
758
|
+
);
|
|
759
|
+
}
|
|
760
|
+
return fallbackClient.execute(stmt);
|
|
761
|
+
};
|
|
762
|
+
adapter = {
|
|
763
|
+
async execute(stmt) {
|
|
764
|
+
if (shouldBypassPostgres(stmt)) {
|
|
765
|
+
return fallbackExecute(stmt);
|
|
766
|
+
}
|
|
767
|
+
try {
|
|
768
|
+
return await executeOnPrisma(prisma, stmt);
|
|
769
|
+
} catch (error) {
|
|
770
|
+
if (shouldFallbackOnError(error)) {
|
|
771
|
+
return fallbackExecute(stmt, error);
|
|
772
|
+
}
|
|
773
|
+
throw error;
|
|
774
|
+
}
|
|
775
|
+
},
|
|
776
|
+
async batch(stmts, mode) {
|
|
777
|
+
if (stmts.some((stmt) => shouldBypassPostgres(stmt))) {
|
|
778
|
+
if (!fallbackClient) {
|
|
779
|
+
throw new Error("Cannot batch unsupported SQLite-only statements without a fallback client.");
|
|
780
|
+
}
|
|
781
|
+
return fallbackClient.batch(stmts, mode);
|
|
782
|
+
}
|
|
783
|
+
try {
|
|
784
|
+
if (prisma.$transaction) {
|
|
785
|
+
return await prisma.$transaction(async (tx) => {
|
|
786
|
+
const results2 = [];
|
|
787
|
+
for (const stmt of stmts) {
|
|
788
|
+
results2.push(await executeOnPrisma(tx, stmt));
|
|
789
|
+
}
|
|
790
|
+
return results2;
|
|
791
|
+
});
|
|
792
|
+
}
|
|
793
|
+
const results = [];
|
|
794
|
+
for (const stmt of stmts) {
|
|
795
|
+
results.push(await executeOnPrisma(prisma, stmt));
|
|
796
|
+
}
|
|
797
|
+
return results;
|
|
798
|
+
} catch (error) {
|
|
799
|
+
if (fallbackClient && shouldFallbackOnError(error)) {
|
|
800
|
+
process.stderr.write(
|
|
801
|
+
`[database-adapter] Falling back batch to SQLite: ${error instanceof Error ? error.message : String(error)}
|
|
802
|
+
`
|
|
803
|
+
);
|
|
804
|
+
return fallbackClient.batch(stmts, mode);
|
|
805
|
+
}
|
|
806
|
+
throw error;
|
|
807
|
+
}
|
|
808
|
+
},
|
|
809
|
+
async migrate(stmts) {
|
|
810
|
+
if (fallbackClient) {
|
|
811
|
+
return fallbackClient.migrate(stmts);
|
|
812
|
+
}
|
|
813
|
+
return adapter.batch(stmts, "deferred");
|
|
814
|
+
},
|
|
815
|
+
async transaction(mode) {
|
|
816
|
+
if (!fallbackClient) {
|
|
817
|
+
throw new Error("Interactive transactions are only supported on the SQLite fallback client.");
|
|
818
|
+
}
|
|
819
|
+
return fallbackClient.transaction(mode);
|
|
820
|
+
},
|
|
821
|
+
async executeMultiple(sql) {
|
|
822
|
+
if (fallbackClient && shouldBypassPostgres(sql)) {
|
|
823
|
+
return fallbackClient.executeMultiple(sql);
|
|
824
|
+
}
|
|
825
|
+
for (const statement of splitSqlStatements(sql)) {
|
|
826
|
+
await adapter.execute(statement);
|
|
827
|
+
}
|
|
828
|
+
},
|
|
829
|
+
async sync() {
|
|
830
|
+
if (fallbackClient) {
|
|
831
|
+
return fallbackClient.sync();
|
|
832
|
+
}
|
|
833
|
+
return { frame_no: 0, frames_synced: 0 };
|
|
834
|
+
},
|
|
835
|
+
close() {
|
|
836
|
+
closed = true;
|
|
837
|
+
prismaClientPromise = null;
|
|
838
|
+
compatibilityBootstrapPromise = null;
|
|
839
|
+
void prisma.$disconnect?.();
|
|
840
|
+
},
|
|
841
|
+
get closed() {
|
|
842
|
+
return closed;
|
|
843
|
+
},
|
|
844
|
+
get protocol() {
|
|
845
|
+
return "prisma-postgres";
|
|
846
|
+
}
|
|
847
|
+
};
|
|
848
|
+
return adapter;
|
|
849
|
+
}
|
|
850
|
+
var VIEW_MAPPINGS, UPSERT_KEYS, BOOLEAN_COLUMNS_BY_TABLE, BOOLEAN_COLUMN_NAMES, IMMEDIATE_FALLBACK_PATTERNS, prismaClientPromise, compatibilityBootstrapPromise;
|
|
851
|
+
var init_database_adapter = __esm({
|
|
852
|
+
"src/lib/database-adapter.ts"() {
|
|
853
|
+
"use strict";
|
|
854
|
+
VIEW_MAPPINGS = [
|
|
855
|
+
{ view: "memories", source: "memory.memory_records" },
|
|
856
|
+
{ view: "tasks", source: "memory.tasks" },
|
|
857
|
+
{ view: "behaviors", source: "memory.behaviors" },
|
|
858
|
+
{ view: "entities", source: "memory.entities" },
|
|
859
|
+
{ view: "relationships", source: "memory.relationships" },
|
|
860
|
+
{ view: "entity_memories", source: "memory.entity_memories" },
|
|
861
|
+
{ view: "entity_aliases", source: "memory.entity_aliases" },
|
|
862
|
+
{ view: "notifications", source: "memory.notifications" },
|
|
863
|
+
{ view: "messages", source: "memory.messages" },
|
|
864
|
+
{ view: "users", source: "wiki.users" },
|
|
865
|
+
{ view: "workspaces", source: "wiki.workspaces" },
|
|
866
|
+
{ view: "workspace_users", source: "wiki.workspace_users" },
|
|
867
|
+
{ view: "documents", source: "wiki.workspace_documents" },
|
|
868
|
+
{ view: "chats", source: "wiki.workspace_chats" }
|
|
869
|
+
];
|
|
870
|
+
UPSERT_KEYS = {
|
|
871
|
+
memories: ["id"],
|
|
872
|
+
tasks: ["id"],
|
|
873
|
+
behaviors: ["id"],
|
|
874
|
+
entities: ["id"],
|
|
875
|
+
relationships: ["id"],
|
|
876
|
+
entity_aliases: ["alias"],
|
|
877
|
+
notifications: ["id"],
|
|
878
|
+
messages: ["id"],
|
|
879
|
+
users: ["id"],
|
|
880
|
+
workspaces: ["id"],
|
|
881
|
+
workspace_users: ["id"],
|
|
882
|
+
documents: ["id"],
|
|
883
|
+
chats: ["id"]
|
|
884
|
+
};
|
|
885
|
+
BOOLEAN_COLUMNS_BY_TABLE = {
|
|
886
|
+
memories: /* @__PURE__ */ new Set(["has_error", "draft"]),
|
|
887
|
+
behaviors: /* @__PURE__ */ new Set(["active"]),
|
|
888
|
+
notifications: /* @__PURE__ */ new Set(["read"]),
|
|
889
|
+
users: /* @__PURE__ */ new Set(["has_personal_memory"])
|
|
890
|
+
};
|
|
891
|
+
BOOLEAN_COLUMN_NAMES = new Set(
|
|
892
|
+
Object.values(BOOLEAN_COLUMNS_BY_TABLE).flatMap((cols) => [...cols])
|
|
893
|
+
);
|
|
894
|
+
IMMEDIATE_FALLBACK_PATTERNS = [
|
|
895
|
+
/\bPRAGMA\b/i,
|
|
896
|
+
/\bsqlite_master\b/i,
|
|
897
|
+
/(?:^|[.\s])(?:memories|conversations|entities)_fts\b/i,
|
|
898
|
+
/\bMATCH\b/i,
|
|
899
|
+
/\bvector_distance_cos\s*\(/i,
|
|
900
|
+
/\bjson_extract\s*\(/i,
|
|
901
|
+
/\bjulianday\s*\(/i,
|
|
902
|
+
/\bstrftime\s*\(/i,
|
|
903
|
+
/\blast_insert_rowid\s*\(/i
|
|
904
|
+
];
|
|
905
|
+
prismaClientPromise = null;
|
|
906
|
+
compatibilityBootstrapPromise = null;
|
|
295
907
|
}
|
|
296
908
|
});
|
|
297
909
|
|
|
298
910
|
// src/lib/database.ts
|
|
299
911
|
import { createClient } from "@libsql/client";
|
|
300
912
|
async function initDatabase(config) {
|
|
913
|
+
if (_walCheckpointTimer) {
|
|
914
|
+
clearInterval(_walCheckpointTimer);
|
|
915
|
+
_walCheckpointTimer = null;
|
|
916
|
+
}
|
|
917
|
+
if (_daemonClient) {
|
|
918
|
+
_daemonClient.close();
|
|
919
|
+
_daemonClient = null;
|
|
920
|
+
}
|
|
921
|
+
if (_adapterClient && _adapterClient !== _resilientClient) {
|
|
922
|
+
_adapterClient.close();
|
|
923
|
+
}
|
|
924
|
+
_adapterClient = null;
|
|
301
925
|
if (_client) {
|
|
302
926
|
_client.close();
|
|
303
927
|
_client = null;
|
|
@@ -311,6 +935,7 @@ async function initDatabase(config) {
|
|
|
311
935
|
}
|
|
312
936
|
_client = createClient(opts);
|
|
313
937
|
_resilientClient = wrapWithRetry(_client);
|
|
938
|
+
_adapterClient = _resilientClient;
|
|
314
939
|
_client.execute("PRAGMA busy_timeout = 30000").catch(() => {
|
|
315
940
|
});
|
|
316
941
|
_client.execute("PRAGMA journal_mode = WAL").catch(() => {
|
|
@@ -321,11 +946,17 @@ async function initDatabase(config) {
|
|
|
321
946
|
});
|
|
322
947
|
}, 3e4);
|
|
323
948
|
_walCheckpointTimer.unref();
|
|
949
|
+
if (process.env.DATABASE_URL) {
|
|
950
|
+
_adapterClient = await createPrismaDbAdapter(_resilientClient);
|
|
951
|
+
}
|
|
324
952
|
}
|
|
325
953
|
function getClient() {
|
|
326
|
-
if (!
|
|
954
|
+
if (!_adapterClient) {
|
|
327
955
|
throw new Error("Database client not initialized. Call initDatabase() first.");
|
|
328
956
|
}
|
|
957
|
+
if (process.env.DATABASE_URL) {
|
|
958
|
+
return _adapterClient;
|
|
959
|
+
}
|
|
329
960
|
if (process.env.EXE_IS_DAEMON === "1") {
|
|
330
961
|
return _resilientClient;
|
|
331
962
|
}
|
|
@@ -618,6 +1249,7 @@ async function ensureSchema() {
|
|
|
618
1249
|
project TEXT NOT NULL,
|
|
619
1250
|
summary TEXT NOT NULL,
|
|
620
1251
|
task_file TEXT,
|
|
1252
|
+
session_scope TEXT,
|
|
621
1253
|
read INTEGER NOT NULL DEFAULT 0,
|
|
622
1254
|
created_at TEXT NOT NULL
|
|
623
1255
|
);
|
|
@@ -626,7 +1258,7 @@ async function ensureSchema() {
|
|
|
626
1258
|
ON notifications(read);
|
|
627
1259
|
|
|
628
1260
|
CREATE INDEX IF NOT EXISTS idx_notifications_agent
|
|
629
|
-
ON notifications(agent_id);
|
|
1261
|
+
ON notifications(agent_id, session_scope);
|
|
630
1262
|
|
|
631
1263
|
CREATE INDEX IF NOT EXISTS idx_notifications_task_file
|
|
632
1264
|
ON notifications(task_file);
|
|
@@ -664,6 +1296,7 @@ async function ensureSchema() {
|
|
|
664
1296
|
target_agent TEXT NOT NULL,
|
|
665
1297
|
target_project TEXT,
|
|
666
1298
|
target_device TEXT NOT NULL DEFAULT 'local',
|
|
1299
|
+
session_scope TEXT,
|
|
667
1300
|
content TEXT NOT NULL,
|
|
668
1301
|
priority TEXT DEFAULT 'normal',
|
|
669
1302
|
status TEXT DEFAULT 'pending',
|
|
@@ -677,10 +1310,31 @@ async function ensureSchema() {
|
|
|
677
1310
|
);
|
|
678
1311
|
|
|
679
1312
|
CREATE INDEX IF NOT EXISTS idx_messages_target
|
|
680
|
-
ON messages(target_agent, status);
|
|
1313
|
+
ON messages(target_agent, session_scope, status);
|
|
681
1314
|
|
|
682
1315
|
CREATE INDEX IF NOT EXISTS idx_messages_conversation_order
|
|
683
|
-
ON messages(target_agent, from_agent, server_seq);
|
|
1316
|
+
ON messages(target_agent, session_scope, from_agent, server_seq);
|
|
1317
|
+
`);
|
|
1318
|
+
try {
|
|
1319
|
+
await client.execute({
|
|
1320
|
+
sql: `ALTER TABLE notifications ADD COLUMN session_scope TEXT`,
|
|
1321
|
+
args: []
|
|
1322
|
+
});
|
|
1323
|
+
} catch {
|
|
1324
|
+
}
|
|
1325
|
+
try {
|
|
1326
|
+
await client.execute({
|
|
1327
|
+
sql: `ALTER TABLE messages ADD COLUMN session_scope TEXT`,
|
|
1328
|
+
args: []
|
|
1329
|
+
});
|
|
1330
|
+
} catch {
|
|
1331
|
+
}
|
|
1332
|
+
await client.executeMultiple(`
|
|
1333
|
+
CREATE INDEX IF NOT EXISTS idx_notifications_agent_scope_read
|
|
1334
|
+
ON notifications(agent_id, session_scope, read, created_at);
|
|
1335
|
+
|
|
1336
|
+
CREATE INDEX IF NOT EXISTS idx_messages_target_scope_status
|
|
1337
|
+
ON messages(target_agent, session_scope, status, created_at);
|
|
684
1338
|
`);
|
|
685
1339
|
try {
|
|
686
1340
|
await client.execute({
|
|
@@ -1264,17 +1918,26 @@ async function ensureSchema() {
|
|
|
1264
1918
|
} catch {
|
|
1265
1919
|
}
|
|
1266
1920
|
}
|
|
1921
|
+
try {
|
|
1922
|
+
await client.execute({
|
|
1923
|
+
sql: `UPDATE tasks SET status = 'closed' WHERE status = 'done' AND result IS NOT NULL`,
|
|
1924
|
+
args: []
|
|
1925
|
+
});
|
|
1926
|
+
} catch {
|
|
1927
|
+
}
|
|
1267
1928
|
}
|
|
1268
|
-
var _client, _resilientClient, _walCheckpointTimer, _daemonClient, initTurso;
|
|
1929
|
+
var _client, _resilientClient, _walCheckpointTimer, _daemonClient, _adapterClient, initTurso;
|
|
1269
1930
|
var init_database = __esm({
|
|
1270
1931
|
"src/lib/database.ts"() {
|
|
1271
1932
|
"use strict";
|
|
1272
1933
|
init_db_retry();
|
|
1273
1934
|
init_employees();
|
|
1935
|
+
init_database_adapter();
|
|
1274
1936
|
_client = null;
|
|
1275
1937
|
_resilientClient = null;
|
|
1276
1938
|
_walCheckpointTimer = null;
|
|
1277
1939
|
_daemonClient = null;
|
|
1940
|
+
_adapterClient = null;
|
|
1278
1941
|
initTurso = initDatabase;
|
|
1279
1942
|
}
|
|
1280
1943
|
});
|
|
@@ -1339,6 +2002,7 @@ var shard_manager_exports = {};
|
|
|
1339
2002
|
__export(shard_manager_exports, {
|
|
1340
2003
|
disposeShards: () => disposeShards,
|
|
1341
2004
|
ensureShardSchema: () => ensureShardSchema,
|
|
2005
|
+
getOpenShardCount: () => getOpenShardCount,
|
|
1342
2006
|
getReadyShardClient: () => getReadyShardClient,
|
|
1343
2007
|
getShardClient: () => getShardClient,
|
|
1344
2008
|
getShardsDir: () => getShardsDir,
|
|
@@ -1347,15 +2011,18 @@ __export(shard_manager_exports, {
|
|
|
1347
2011
|
listShards: () => listShards,
|
|
1348
2012
|
shardExists: () => shardExists
|
|
1349
2013
|
});
|
|
1350
|
-
import
|
|
1351
|
-
import { existsSync as
|
|
2014
|
+
import path5 from "path";
|
|
2015
|
+
import { existsSync as existsSync5, mkdirSync as mkdirSync2, readdirSync } from "fs";
|
|
1352
2016
|
import { createClient as createClient2 } from "@libsql/client";
|
|
1353
2017
|
function initShardManager(encryptionKey) {
|
|
1354
2018
|
_encryptionKey = encryptionKey;
|
|
1355
|
-
if (!
|
|
1356
|
-
|
|
2019
|
+
if (!existsSync5(SHARDS_DIR)) {
|
|
2020
|
+
mkdirSync2(SHARDS_DIR, { recursive: true });
|
|
1357
2021
|
}
|
|
1358
2022
|
_shardingEnabled = true;
|
|
2023
|
+
if (_evictionTimer) clearInterval(_evictionTimer);
|
|
2024
|
+
_evictionTimer = setInterval(evictIdleShards, EVICTION_INTERVAL_MS);
|
|
2025
|
+
_evictionTimer.unref();
|
|
1359
2026
|
}
|
|
1360
2027
|
function isShardingEnabled() {
|
|
1361
2028
|
return _shardingEnabled;
|
|
@@ -1372,21 +2039,28 @@ function getShardClient(projectName) {
|
|
|
1372
2039
|
throw new Error(`Invalid project name for shard: "${projectName}"`);
|
|
1373
2040
|
}
|
|
1374
2041
|
const cached = _shards.get(safeName);
|
|
1375
|
-
if (cached)
|
|
1376
|
-
|
|
2042
|
+
if (cached) {
|
|
2043
|
+
_shardLastAccess.set(safeName, Date.now());
|
|
2044
|
+
return cached;
|
|
2045
|
+
}
|
|
2046
|
+
while (_shards.size >= MAX_OPEN_SHARDS) {
|
|
2047
|
+
evictLRU();
|
|
2048
|
+
}
|
|
2049
|
+
const dbPath = path5.join(SHARDS_DIR, `${safeName}.db`);
|
|
1377
2050
|
const client = createClient2({
|
|
1378
2051
|
url: `file:${dbPath}`,
|
|
1379
2052
|
encryptionKey: _encryptionKey
|
|
1380
2053
|
});
|
|
1381
2054
|
_shards.set(safeName, client);
|
|
2055
|
+
_shardLastAccess.set(safeName, Date.now());
|
|
1382
2056
|
return client;
|
|
1383
2057
|
}
|
|
1384
2058
|
function shardExists(projectName) {
|
|
1385
2059
|
const safeName = projectName.replace(/[^a-zA-Z0-9_-]/g, "_");
|
|
1386
|
-
return
|
|
2060
|
+
return existsSync5(path5.join(SHARDS_DIR, `${safeName}.db`));
|
|
1387
2061
|
}
|
|
1388
2062
|
function listShards() {
|
|
1389
|
-
if (!
|
|
2063
|
+
if (!existsSync5(SHARDS_DIR)) return [];
|
|
1390
2064
|
return readdirSync(SHARDS_DIR).filter((f) => f.endsWith(".db")).map((f) => f.replace(".db", ""));
|
|
1391
2065
|
}
|
|
1392
2066
|
async function ensureShardSchema(client) {
|
|
@@ -1438,6 +2112,8 @@ async function ensureShardSchema(client) {
|
|
|
1438
2112
|
for (const col of [
|
|
1439
2113
|
"ALTER TABLE memories ADD COLUMN task_id TEXT",
|
|
1440
2114
|
"ALTER TABLE memories ADD COLUMN consolidated INTEGER NOT NULL DEFAULT 0",
|
|
2115
|
+
"ALTER TABLE memories ADD COLUMN author_device_id TEXT",
|
|
2116
|
+
"ALTER TABLE memories ADD COLUMN scope TEXT NOT NULL DEFAULT 'business'",
|
|
1441
2117
|
"ALTER TABLE memories ADD COLUMN importance INTEGER DEFAULT 5",
|
|
1442
2118
|
"ALTER TABLE memories ADD COLUMN status TEXT DEFAULT 'active'",
|
|
1443
2119
|
"ALTER TABLE memories ADD COLUMN wiki_synced INTEGER DEFAULT 0",
|
|
@@ -1460,7 +2136,23 @@ async function ensureShardSchema(client) {
|
|
|
1460
2136
|
// MS-11: draft staging, MS-6a: memory_type, MS-7: trajectory
|
|
1461
2137
|
"ALTER TABLE memories ADD COLUMN draft INTEGER DEFAULT 0",
|
|
1462
2138
|
"ALTER TABLE memories ADD COLUMN memory_type TEXT DEFAULT 'raw'",
|
|
1463
|
-
"ALTER TABLE memories ADD COLUMN trajectory TEXT"
|
|
2139
|
+
"ALTER TABLE memories ADD COLUMN trajectory TEXT",
|
|
2140
|
+
// Metadata enrichment columns (must match database.ts)
|
|
2141
|
+
"ALTER TABLE memories ADD COLUMN intent TEXT",
|
|
2142
|
+
"ALTER TABLE memories ADD COLUMN outcome TEXT",
|
|
2143
|
+
"ALTER TABLE memories ADD COLUMN domain TEXT",
|
|
2144
|
+
"ALTER TABLE memories ADD COLUMN referenced_entities TEXT",
|
|
2145
|
+
"ALTER TABLE memories ADD COLUMN retrieval_count INTEGER DEFAULT 0",
|
|
2146
|
+
"ALTER TABLE memories ADD COLUMN chain_position TEXT",
|
|
2147
|
+
"ALTER TABLE memories ADD COLUMN review_status TEXT",
|
|
2148
|
+
"ALTER TABLE memories ADD COLUMN context_window_pct INTEGER",
|
|
2149
|
+
"ALTER TABLE memories ADD COLUMN file_paths TEXT",
|
|
2150
|
+
"ALTER TABLE memories ADD COLUMN commit_hash TEXT",
|
|
2151
|
+
"ALTER TABLE memories ADD COLUMN duration_ms INTEGER",
|
|
2152
|
+
"ALTER TABLE memories ADD COLUMN token_cost REAL",
|
|
2153
|
+
"ALTER TABLE memories ADD COLUMN audience TEXT",
|
|
2154
|
+
"ALTER TABLE memories ADD COLUMN language_type TEXT",
|
|
2155
|
+
"ALTER TABLE memories ADD COLUMN parent_memory_id TEXT"
|
|
1464
2156
|
]) {
|
|
1465
2157
|
try {
|
|
1466
2158
|
await client.execute(col);
|
|
@@ -1559,21 +2251,69 @@ async function getReadyShardClient(projectName) {
|
|
|
1559
2251
|
await ensureShardSchema(client);
|
|
1560
2252
|
return client;
|
|
1561
2253
|
}
|
|
2254
|
+
function evictLRU() {
|
|
2255
|
+
let oldest = null;
|
|
2256
|
+
let oldestTime = Infinity;
|
|
2257
|
+
for (const [name, time] of _shardLastAccess) {
|
|
2258
|
+
if (time < oldestTime) {
|
|
2259
|
+
oldestTime = time;
|
|
2260
|
+
oldest = name;
|
|
2261
|
+
}
|
|
2262
|
+
}
|
|
2263
|
+
if (oldest) {
|
|
2264
|
+
const client = _shards.get(oldest);
|
|
2265
|
+
if (client) {
|
|
2266
|
+
client.close();
|
|
2267
|
+
}
|
|
2268
|
+
_shards.delete(oldest);
|
|
2269
|
+
_shardLastAccess.delete(oldest);
|
|
2270
|
+
}
|
|
2271
|
+
}
|
|
2272
|
+
function evictIdleShards() {
|
|
2273
|
+
const now = Date.now();
|
|
2274
|
+
const toEvict = [];
|
|
2275
|
+
for (const [name, lastAccess] of _shardLastAccess) {
|
|
2276
|
+
if (now - lastAccess > SHARD_IDLE_MS) {
|
|
2277
|
+
toEvict.push(name);
|
|
2278
|
+
}
|
|
2279
|
+
}
|
|
2280
|
+
for (const name of toEvict) {
|
|
2281
|
+
const client = _shards.get(name);
|
|
2282
|
+
if (client) {
|
|
2283
|
+
client.close();
|
|
2284
|
+
}
|
|
2285
|
+
_shards.delete(name);
|
|
2286
|
+
_shardLastAccess.delete(name);
|
|
2287
|
+
}
|
|
2288
|
+
}
|
|
2289
|
+
function getOpenShardCount() {
|
|
2290
|
+
return _shards.size;
|
|
2291
|
+
}
|
|
1562
2292
|
function disposeShards() {
|
|
2293
|
+
if (_evictionTimer) {
|
|
2294
|
+
clearInterval(_evictionTimer);
|
|
2295
|
+
_evictionTimer = null;
|
|
2296
|
+
}
|
|
1563
2297
|
for (const [, client] of _shards) {
|
|
1564
2298
|
client.close();
|
|
1565
2299
|
}
|
|
1566
2300
|
_shards.clear();
|
|
2301
|
+
_shardLastAccess.clear();
|
|
1567
2302
|
_shardingEnabled = false;
|
|
1568
2303
|
_encryptionKey = null;
|
|
1569
2304
|
}
|
|
1570
|
-
var SHARDS_DIR, _shards, _encryptionKey, _shardingEnabled;
|
|
2305
|
+
var SHARDS_DIR, SHARD_IDLE_MS, MAX_OPEN_SHARDS, EVICTION_INTERVAL_MS, _shards, _shardLastAccess, _evictionTimer, _encryptionKey, _shardingEnabled;
|
|
1571
2306
|
var init_shard_manager = __esm({
|
|
1572
2307
|
"src/lib/shard-manager.ts"() {
|
|
1573
2308
|
"use strict";
|
|
1574
2309
|
init_config();
|
|
1575
|
-
SHARDS_DIR =
|
|
2310
|
+
SHARDS_DIR = path5.join(EXE_AI_DIR, "shards");
|
|
2311
|
+
SHARD_IDLE_MS = 5 * 60 * 1e3;
|
|
2312
|
+
MAX_OPEN_SHARDS = 10;
|
|
2313
|
+
EVICTION_INTERVAL_MS = 60 * 1e3;
|
|
1576
2314
|
_shards = /* @__PURE__ */ new Map();
|
|
2315
|
+
_shardLastAccess = /* @__PURE__ */ new Map();
|
|
2316
|
+
_evictionTimer = null;
|
|
1577
2317
|
_encryptionKey = null;
|
|
1578
2318
|
_shardingEnabled = false;
|
|
1579
2319
|
}
|
|
@@ -1767,13 +2507,13 @@ ${p.content}`).join("\n\n");
|
|
|
1767
2507
|
});
|
|
1768
2508
|
|
|
1769
2509
|
// src/lib/session-registry.ts
|
|
1770
|
-
import
|
|
1771
|
-
import
|
|
2510
|
+
import path6 from "path";
|
|
2511
|
+
import os5 from "os";
|
|
1772
2512
|
var REGISTRY_PATH;
|
|
1773
2513
|
var init_session_registry = __esm({
|
|
1774
2514
|
"src/lib/session-registry.ts"() {
|
|
1775
2515
|
"use strict";
|
|
1776
|
-
REGISTRY_PATH =
|
|
2516
|
+
REGISTRY_PATH = path6.join(os5.homedir(), ".exe-os", "session-registry.json");
|
|
1777
2517
|
}
|
|
1778
2518
|
});
|
|
1779
2519
|
|
|
@@ -2008,15 +2748,16 @@ var init_runtime_table = __esm({
|
|
|
2008
2748
|
});
|
|
2009
2749
|
|
|
2010
2750
|
// src/lib/agent-config.ts
|
|
2011
|
-
import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as
|
|
2012
|
-
import
|
|
2751
|
+
import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync6 } from "fs";
|
|
2752
|
+
import path7 from "path";
|
|
2013
2753
|
var AGENT_CONFIG_PATH, DEFAULT_MODELS;
|
|
2014
2754
|
var init_agent_config = __esm({
|
|
2015
2755
|
"src/lib/agent-config.ts"() {
|
|
2016
2756
|
"use strict";
|
|
2017
2757
|
init_config();
|
|
2018
2758
|
init_runtime_table();
|
|
2019
|
-
|
|
2759
|
+
init_secure_files();
|
|
2760
|
+
AGENT_CONFIG_PATH = path7.join(EXE_AI_DIR, "agent-config.json");
|
|
2020
2761
|
DEFAULT_MODELS = {
|
|
2021
2762
|
claude: "claude-opus-4",
|
|
2022
2763
|
codex: RUNTIME_TABLE.codex?.defaultModel ?? "gpt-5.4",
|
|
@@ -2026,38 +2767,41 @@ var init_agent_config = __esm({
|
|
|
2026
2767
|
});
|
|
2027
2768
|
|
|
2028
2769
|
// src/lib/intercom-queue.ts
|
|
2029
|
-
import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, renameSync as renameSync3, existsSync as
|
|
2030
|
-
import
|
|
2031
|
-
import
|
|
2770
|
+
import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, renameSync as renameSync3, existsSync as existsSync7, mkdirSync as mkdirSync3 } from "fs";
|
|
2771
|
+
import path8 from "path";
|
|
2772
|
+
import os6 from "os";
|
|
2032
2773
|
var QUEUE_PATH, TTL_MS, INTERCOM_LOG;
|
|
2033
2774
|
var init_intercom_queue = __esm({
|
|
2034
2775
|
"src/lib/intercom-queue.ts"() {
|
|
2035
2776
|
"use strict";
|
|
2036
|
-
QUEUE_PATH =
|
|
2777
|
+
QUEUE_PATH = path8.join(os6.homedir(), ".exe-os", "intercom-queue.json");
|
|
2037
2778
|
TTL_MS = 60 * 60 * 1e3;
|
|
2038
|
-
INTERCOM_LOG =
|
|
2779
|
+
INTERCOM_LOG = path8.join(os6.homedir(), ".exe-os", "intercom.log");
|
|
2039
2780
|
}
|
|
2040
2781
|
});
|
|
2041
2782
|
|
|
2042
2783
|
// src/lib/license.ts
|
|
2043
|
-
import { readFileSync as readFileSync5, writeFileSync as writeFileSync4, existsSync as
|
|
2784
|
+
import { readFileSync as readFileSync5, writeFileSync as writeFileSync4, existsSync as existsSync8, mkdirSync as mkdirSync4 } from "fs";
|
|
2044
2785
|
import { randomUUID as randomUUID2 } from "crypto";
|
|
2045
|
-
import
|
|
2786
|
+
import { createRequire as createRequire2 } from "module";
|
|
2787
|
+
import { pathToFileURL as pathToFileURL2 } from "url";
|
|
2788
|
+
import os7 from "os";
|
|
2789
|
+
import path9 from "path";
|
|
2046
2790
|
import { jwtVerify, importSPKI } from "jose";
|
|
2047
2791
|
var LICENSE_PATH, CACHE_PATH, DEVICE_ID_PATH;
|
|
2048
2792
|
var init_license = __esm({
|
|
2049
2793
|
"src/lib/license.ts"() {
|
|
2050
2794
|
"use strict";
|
|
2051
2795
|
init_config();
|
|
2052
|
-
LICENSE_PATH =
|
|
2053
|
-
CACHE_PATH =
|
|
2054
|
-
DEVICE_ID_PATH =
|
|
2796
|
+
LICENSE_PATH = path9.join(EXE_AI_DIR, "license.key");
|
|
2797
|
+
CACHE_PATH = path9.join(EXE_AI_DIR, "license-cache.json");
|
|
2798
|
+
DEVICE_ID_PATH = path9.join(EXE_AI_DIR, "device-id");
|
|
2055
2799
|
}
|
|
2056
2800
|
});
|
|
2057
2801
|
|
|
2058
2802
|
// src/lib/plan-limits.ts
|
|
2059
|
-
import { readFileSync as readFileSync6, existsSync as
|
|
2060
|
-
import
|
|
2803
|
+
import { readFileSync as readFileSync6, existsSync as existsSync9 } from "fs";
|
|
2804
|
+
import path10 from "path";
|
|
2061
2805
|
var CACHE_PATH2;
|
|
2062
2806
|
var init_plan_limits = __esm({
|
|
2063
2807
|
"src/lib/plan-limits.ts"() {
|
|
@@ -2066,14 +2810,14 @@ var init_plan_limits = __esm({
|
|
|
2066
2810
|
init_employees();
|
|
2067
2811
|
init_license();
|
|
2068
2812
|
init_config();
|
|
2069
|
-
CACHE_PATH2 =
|
|
2813
|
+
CACHE_PATH2 = path10.join(EXE_AI_DIR, "license-cache.json");
|
|
2070
2814
|
}
|
|
2071
2815
|
});
|
|
2072
2816
|
|
|
2073
2817
|
// src/lib/tmux-routing.ts
|
|
2074
|
-
import { readFileSync as readFileSync7, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, existsSync as
|
|
2075
|
-
import
|
|
2076
|
-
import
|
|
2818
|
+
import { readFileSync as readFileSync7, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, existsSync as existsSync10, appendFileSync, readdirSync as readdirSync2 } from "fs";
|
|
2819
|
+
import path11 from "path";
|
|
2820
|
+
import os8 from "os";
|
|
2077
2821
|
import { fileURLToPath } from "url";
|
|
2078
2822
|
function getMySession() {
|
|
2079
2823
|
return getTransport().getMySession();
|
|
@@ -2086,7 +2830,7 @@ function extractRootExe(name) {
|
|
|
2086
2830
|
}
|
|
2087
2831
|
function getParentExe(sessionKey) {
|
|
2088
2832
|
try {
|
|
2089
|
-
const data = JSON.parse(readFileSync7(
|
|
2833
|
+
const data = JSON.parse(readFileSync7(path11.join(SESSION_CACHE, `parent-exe-${sessionKey}.json`), "utf8"));
|
|
2090
2834
|
return data.parentExe || null;
|
|
2091
2835
|
} catch {
|
|
2092
2836
|
return null;
|
|
@@ -2129,10 +2873,10 @@ var init_tmux_routing = __esm({
|
|
|
2129
2873
|
init_intercom_queue();
|
|
2130
2874
|
init_plan_limits();
|
|
2131
2875
|
init_employees();
|
|
2132
|
-
SPAWN_LOCK_DIR =
|
|
2133
|
-
SESSION_CACHE =
|
|
2134
|
-
INTERCOM_LOG2 =
|
|
2135
|
-
DEBOUNCE_FILE =
|
|
2876
|
+
SPAWN_LOCK_DIR = path11.join(os8.homedir(), ".exe-os", "spawn-locks");
|
|
2877
|
+
SESSION_CACHE = path11.join(os8.homedir(), ".exe-os", "session-cache");
|
|
2878
|
+
INTERCOM_LOG2 = path11.join(os8.homedir(), ".exe-os", "intercom.log");
|
|
2879
|
+
DEBOUNCE_FILE = path11.join(SESSION_CACHE, "intercom-debounce.json");
|
|
2136
2880
|
DEBOUNCE_CLEANUP_AGE_MS = 5 * 60 * 1e3;
|
|
2137
2881
|
}
|
|
2138
2882
|
});
|
|
@@ -2167,16 +2911,16 @@ init_database();
|
|
|
2167
2911
|
|
|
2168
2912
|
// src/lib/keychain.ts
|
|
2169
2913
|
import { readFile as readFile3, writeFile as writeFile3, unlink, mkdir as mkdir3, chmod as chmod2 } from "fs/promises";
|
|
2170
|
-
import { existsSync as
|
|
2171
|
-
import
|
|
2172
|
-
import
|
|
2914
|
+
import { existsSync as existsSync4 } from "fs";
|
|
2915
|
+
import path4 from "path";
|
|
2916
|
+
import os4 from "os";
|
|
2173
2917
|
var SERVICE = "exe-mem";
|
|
2174
2918
|
var ACCOUNT = "master-key";
|
|
2175
2919
|
function getKeyDir() {
|
|
2176
|
-
return process.env.EXE_OS_DIR ?? process.env.EXE_MEM_DIR ??
|
|
2920
|
+
return process.env.EXE_OS_DIR ?? process.env.EXE_MEM_DIR ?? path4.join(os4.homedir(), ".exe-os");
|
|
2177
2921
|
}
|
|
2178
2922
|
function getKeyPath() {
|
|
2179
|
-
return
|
|
2923
|
+
return path4.join(getKeyDir(), "master.key");
|
|
2180
2924
|
}
|
|
2181
2925
|
async function tryKeytar() {
|
|
2182
2926
|
try {
|
|
@@ -2197,9 +2941,9 @@ async function getMasterKey() {
|
|
|
2197
2941
|
}
|
|
2198
2942
|
}
|
|
2199
2943
|
const keyPath = getKeyPath();
|
|
2200
|
-
if (!
|
|
2944
|
+
if (!existsSync4(keyPath)) {
|
|
2201
2945
|
process.stderr.write(
|
|
2202
|
-
`[keychain] Key not found at ${keyPath} (HOME=${
|
|
2946
|
+
`[keychain] Key not found at ${keyPath} (HOME=${os4.homedir()}, EXE_OS_DIR=${process.env.EXE_OS_DIR ?? "unset"})
|
|
2203
2947
|
`
|
|
2204
2948
|
);
|
|
2205
2949
|
return null;
|