style: apply prettier formatting

This commit is contained in:
ejclaw
2026-04-08 19:20:22 +09:00
parent 8b9bebd29e
commit 1fedd36ec7
11 changed files with 65 additions and 50 deletions

View File

@@ -44,9 +44,11 @@ describe('config/env loading', () => {
it('preserves empty-string env values and still prefers process.env over .env', async () => { it('preserves empty-string env values and still prefers process.env over .env', async () => {
fs.writeFileSync( fs.writeFileSync(
path.join(tempRoot, '.env'), path.join(tempRoot, '.env'),
['FROM_FILE=file-value', 'EMPTY_IN_FILE=', 'PROCESS_EMPTY=file-fallback'].join( [
'\n', 'FROM_FILE=file-value',
), 'EMPTY_IN_FILE=',
'PROCESS_EMPTY=file-fallback',
].join('\n'),
); );
process.env.FROM_FILE = 'process-value'; process.env.FROM_FILE = 'process-value';
process.env.PROCESS_EMPTY = ''; process.env.PROCESS_EMPTY = '';

View File

@@ -121,7 +121,9 @@ export function loadConfig(): AppConfig {
const rawMaxRoundTrips = readText('PAIRED_MAX_ROUND_TRIPS'); const rawMaxRoundTrips = readText('PAIRED_MAX_ROUND_TRIPS');
const maxRoundTrips = const maxRoundTrips =
rawMaxRoundTrips === '0' ? Infinity : readInteger('PAIRED_MAX_ROUND_TRIPS', 1000); rawMaxRoundTrips === '0'
? Infinity
: readInteger('PAIRED_MAX_ROUND_TRIPS', 1000);
return { return {
assistant: { assistant: {
@@ -157,8 +159,7 @@ export function loadConfig(): AppConfig {
readNonEmptyText('EJCLAW_DATA_DIR') ?? path.join(projectRoot, 'data'), readNonEmptyText('EJCLAW_DATA_DIR') ?? path.join(projectRoot, 'data'),
), ),
cacheDir: path.resolve( cacheDir: path.resolve(
readNonEmptyText('EJCLAW_CACHE_DIR') ?? readNonEmptyText('EJCLAW_CACHE_DIR') ?? path.join(projectRoot, 'cache'),
path.join(projectRoot, 'cache'),
), ),
}, },
runtime: { runtime: {
@@ -216,9 +217,11 @@ export function loadConfig(): AppConfig {
}, },
sessionCommands: { sessionCommands: {
allowedSenders: new Set( allowedSenders: new Set(
((readText('SESSION_COMMAND_ALLOWED_SENDERS') ?? (
readText('SESSION_COMMAND_USER_IDS')) ?? readText('SESSION_COMMAND_ALLOWED_SENDERS') ??
'') readText('SESSION_COMMAND_USER_IDS') ??
''
)
.split(',') .split(',')
.map((value) => value.trim()) .map((value) => value.trim())
.filter(Boolean), .filter(Boolean),

View File

@@ -1598,16 +1598,20 @@ describe('room assignment writes', () => {
roomMode: 'tribunal', roomMode: 'tribunal',
ownerAgentType: 'codex', ownerAgentType: 'codex',
}); });
expect(getAllRegisteredGroups('claude-code')['dc:projection-room']).toMatchObject({ expect(
getAllRegisteredGroups('claude-code')['dc:projection-room'],
).toMatchObject({
name: 'Projection Room Renamed', name: 'Projection Room Renamed',
folder: 'projection-room', folder: 'projection-room',
agentType: 'claude-code', agentType: 'claude-code',
}); });
expect(getAllRegisteredGroups('codex')['dc:projection-room']).toMatchObject({ expect(getAllRegisteredGroups('codex')['dc:projection-room']).toMatchObject(
name: 'Projection Room Renamed', {
folder: 'projection-room', name: 'Projection Room Renamed',
agentType: 'codex', folder: 'projection-room',
}); agentType: 'codex',
},
);
}); });
}); });

View File

@@ -672,9 +672,7 @@ export function markWorkItemDeliveryRetry(id: number, error: string): void {
markWorkItemDeliveryRetryInDatabase(db, id, error); markWorkItemDeliveryRetryInDatabase(db, id, error);
} }
export function createTask( export function createTask(task: CreateScheduledTaskInput): void {
task: CreateScheduledTaskInput,
): void {
createTaskInDatabase(db, task); createTaskInDatabase(db, task);
} }
@@ -705,10 +703,7 @@ export function getAllTasks(agentType?: AgentType): ScheduledTask[] {
return getAllTasksFromDatabase(db, agentType); return getAllTasksFromDatabase(db, agentType);
} }
export function updateTask( export function updateTask(id: string, updates: ScheduledTaskUpdates): void {
id: string,
updates: ScheduledTaskUpdates,
): void {
updateTaskInDatabase(db, id, updates); updateTaskInDatabase(db, id, updates);
} }
@@ -1200,7 +1195,6 @@ export function getEffectiveRuntimeRoomMode(chatJid: string): RoomMode {
: 'single'; : 'single';
} }
// --- Paired task/project/workspace state --- // --- Paired task/project/workspace state ---
export function upsertPairedProject(project: PairedProject): void { export function upsertPairedProject(project: PairedProject): void {

View File

@@ -78,7 +78,10 @@ export function migrateJsonStateFromFiles(
} }
} }
const sessions = migrateFile('sessions.json') as Record<string, string> | null; const sessions = migrateFile('sessions.json') as Record<
string,
string
> | null;
if (sessions) { if (sessions) {
for (const [folder, sessionId] of Object.entries(sessions)) { for (const [folder, sessionId] of Object.entries(sessions)) {
hooks.setSession(folder, sessionId); hooks.setSession(folder, sessionId);

View File

@@ -339,29 +339,29 @@ export function backfillWorkItemServiceShadows(database: Database): void {
WHERE id = ?`, WHERE id = ?`,
); );
const tx = database.transaction((workItemRows: WorkItemServiceShadowRow[]) => { const tx = database.transaction(
for (const row of workItemRows) { (workItemRows: WorkItemServiceShadowRow[]) => {
const agentType = normalizeStoredAgentType(row.agent_type); for (const row of workItemRows) {
if (!agentType) { const agentType = normalizeStoredAgentType(row.agent_type);
continue; if (!agentType) {
continue;
}
const normalizedServiceId = resolveWorkItemServiceShadow(
agentType,
row.delivery_role,
);
if (normalizedServiceId === row.service_id) {
continue;
}
update.run(normalizedServiceId, row.id);
} }
const normalizedServiceId = resolveWorkItemServiceShadow( },
agentType, );
row.delivery_role,
);
if (normalizedServiceId === row.service_id) {
continue;
}
update.run(normalizedServiceId, row.id);
}
});
tx(rows); tx(rows);
} }
export function backfillServiceHandoffServiceShadows( export function backfillServiceHandoffServiceShadows(database: Database): void {
database: Database,
): void {
const rows = database const rows = database
.prepare( .prepare(
`SELECT `SELECT

View File

@@ -145,7 +145,10 @@ function queryFtsRowOrder(
} }
} }
export function touchMemoriesInDatabase(database: Database, ids: number[]): void { export function touchMemoriesInDatabase(
database: Database,
ids: number[],
): void {
const uniqueIds = [ const uniqueIds = [
...new Set(ids.filter((id) => Number.isInteger(id) && id > 0)), ...new Set(ids.filter((id) => Number.isInteger(id) && id > 0)),
]; ];

View File

@@ -91,7 +91,10 @@ export function applySchemaMigrations(
`ALTER TABLE room_settings ADD COLUMN mode_source TEXT NOT NULL DEFAULT 'explicit'`, `ALTER TABLE room_settings ADD COLUMN mode_source TEXT NOT NULL DEFAULT 'explicit'`,
); );
tryExecMigration(database, `ALTER TABLE room_settings ADD COLUMN name TEXT`); tryExecMigration(database, `ALTER TABLE room_settings ADD COLUMN name TEXT`);
tryExecMigration(database, `ALTER TABLE room_settings ADD COLUMN folder TEXT`); tryExecMigration(
database,
`ALTER TABLE room_settings ADD COLUMN folder TEXT`,
);
tryExecMigration( tryExecMigration(
database, database,
`ALTER TABLE room_settings ADD COLUMN trigger_pattern TEXT`, `ALTER TABLE room_settings ADD COLUMN trigger_pattern TEXT`,

View File

@@ -87,7 +87,9 @@ export function deleteAllSessionsForGroupFromDatabase(
database: Database, database: Database,
groupFolder: string, groupFolder: string,
): void { ): void {
database.prepare('DELETE FROM sessions WHERE group_folder = ?').run(groupFolder); database
.prepare('DELETE FROM sessions WHERE group_folder = ?')
.run(groupFolder);
} }
export function getAllSessionsForAgentTypeFromDatabase( export function getAllSessionsForAgentTypeFromDatabase(

View File

@@ -73,9 +73,9 @@ export function getTaskByIdFromDatabase(
database: Database, database: Database,
id: string, id: string,
): ScheduledTask | undefined { ): ScheduledTask | undefined {
return database.prepare('SELECT * FROM scheduled_tasks WHERE id = ?').get(id) as return database
| ScheduledTask .prepare('SELECT * FROM scheduled_tasks WHERE id = ?')
| undefined; .get(id) as ScheduledTask | undefined;
} }
export function findDuplicateCiWatcherInDatabase( export function findDuplicateCiWatcherInDatabase(

View File

@@ -140,8 +140,9 @@ export function createProducedWorkItemInDatabase(
database.prepare('SELECT last_insert_rowid() as id').get() as { id: number } database.prepare('SELECT last_insert_rowid() as id').get() as { id: number }
).id; ).id;
return hydrateWorkItemRow( return hydrateWorkItemRow(
database.prepare('SELECT * FROM work_items WHERE id = ?').get(lastId) as database
| StoredWorkItemRow, .prepare('SELECT * FROM work_items WHERE id = ?')
.get(lastId) as StoredWorkItemRow,
); );
} }