Skip to content

armgit / Orkas

Public Imported from GitHub
0

Orkas is an open-source (MIT), local-first AI team for your desktop: a Commander turns your goal into to-dos and coordinates 16 built-in specialist agents plus Claude Code, Codex, OpenCode, OpenClaw and Hermes, with projects, scheduled automations and connectors. Free app for macOS & Windows; built-in models or your own keys.

Refine task and user metadata handling

wyt51c431fc2c80
diff --git a/src/main/features/auto_tasks.ts b/src/main/features/auto_tasks.ts
index 4ff571bc..d2d3759c 100644
--- a/src/main/features/auto_tasks.ts
+++ b/src/main/features/auto_tasks.ts
@@ -850,6 +850,17 @@ function _tryClaimFireBoundary(uid: string, task: AutoTask, boundary: Date, now:
}
}
+function _releaseFireBoundaryClaim(uid: string, task: AutoTask, boundary: Date): void {
+ const file = _claimFile(uid, task.id, boundary);
+ try {
+ fs.unlinkSync(file);
+ } catch (err) {
+ const code = (err as NodeJS.ErrnoException).code;
+ if (code === 'ENOENT') return;
+ log.warn(`fire claim release failed uid=${uid} id=${task.id}: ${(err as Error).message}`);
+ }
+}
+
// ── Dispatch ────────────────────────────────────────────────────────────
function _formatSeedPrefix(
@@ -1180,6 +1191,14 @@ async function _onTimerFire(uid: string, taskId: string): Promise<void> {
// Stamp last_run_at FIRST (and disable on one_time) so a slow fire
// can't get re-picked by a future re-schedule.
await _markRan(uid, taskId, now.toISOString(), task.schedule.type === 'one_time');
+ } catch (err) {
+ _releaseFireBoundaryClaim(uid, task, dueBoundary);
+ log.warn(`fire mark failed id=${taskId}: ${(err as Error).message}`);
+ const fresh = await _readOne(uid, taskId);
+ if (fresh) _scheduleTask(uid, fresh);
+ return;
+ }
+ try {
await _fireTask(uid, task);
} catch (err) {
log.warn(`fire failed id=${taskId}: ${(err as Error).message}`);
diff --git a/src/main/features/users.ts b/src/main/features/users.ts
index 5fe6ad68..23207836 100644
--- a/src/main/features/users.ts
+++ b/src/main/features/users.ts
@@ -139,9 +139,14 @@ function readRegistry(): UsersRegistry | null {
migrated = true;
}
if (!hasUser(devCur)) {
- // Migration: older files did not have dev_current_user_id. Seed it from
- // current_user_id so dev starts from the same uid once, then diverges.
- devCur = cur;
+ // Migration: older files did not have dev_current_user_id. A dev process may
+ // seed itself from the historical current pointer once; a prod process must
+ // not manufacture a dev pointer to the prod account during unrelated uid
+ // migrations.
+ devCur = CURRENT_USER_FIELD === 'dev_current_user_id' ? cur : ANONYMOUS_LOCAL_ID;
+ if (!hasUser(devCur)) {
+ users.push({ user_id: devCur, created_at: nowIso() });
+ }
migrated = true;
}
@@ -165,14 +170,25 @@ function recordForLocalId(localId: string): UserRecord {
return reg?.users.find((u) => u.user_id === localId) || { user_id: localId, created_at: nowIso() };
}
+function otherCurrentUserField(field: CurrentUserField): CurrentUserField {
+ return field === 'current_user_id' ? 'dev_current_user_id' : 'current_user_id';
+}
+
function replaceCurrentLocalId(reg: UsersRegistry, from: string, to: string): UsersRegistry {
+ if (from === to) return reg;
const fromRecord = reg.users.find((u) => u.user_id === from);
const existingTarget = reg.users.find((u) => u.user_id === to);
- const nextUsers = reg.users.filter((u) => u.user_id !== from && u.user_id !== to);
+ const otherField = otherCurrentUserField(CURRENT_USER_FIELD);
+ const nextCurrent = reg[CURRENT_USER_FIELD] === from ? to : reg[CURRENT_USER_FIELD];
+ const keepFrom = reg[otherField] === from || nextCurrent === from;
+ const nextUsers = reg.users.filter((u) => u.user_id !== to && (keepFrom || u.user_id !== from));
+ if (keepFrom && !nextUsers.some((u) => u.user_id === from)) {
+ nextUsers.push(fromRecord || { user_id: from, created_at: nowIso() });
+ }
nextUsers.push(existingTarget || { user_id: to, created_at: fromRecord?.created_at || nowIso() });
return {
- current_user_id: reg.current_user_id === from ? to : reg.current_user_id,
- dev_current_user_id: reg.dev_current_user_id === from ? to : reg.dev_current_user_id,
+ current_user_id: CURRENT_USER_FIELD === 'current_user_id' ? nextCurrent : reg.current_user_id,
+ dev_current_user_id: CURRENT_USER_FIELD === 'dev_current_user_id' ? nextCurrent : reg.dev_current_user_id,
users: nextUsers,
};
}
diff --git a/src/renderer/modules/contexts.js b/src/renderer/modules/contexts.js
index da1ae360..5025e4db 100644
--- a/src/renderer/modules/contexts.js
+++ b/src/renderer/modules/contexts.js
@@ -953,6 +953,15 @@ function _ctxHasHiddenPathSegment(name) {
return String(name || '').split('/').some(part => part.startsWith('.'));
}
+function _ctxUploadErrorCode(reason) {
+ const text = String(reason || '').toLowerCase();
+ if (text === 'ext') return 'ext';
+ if (text === 'hidden') return 'hidden';
+ if (/picker/.test(text)) return 'picker_failed';
+ if (/network|fetch|timeout|econn|enotfound|socket/.test(text)) return 'network';
+ return 'upload_failed';
+}
+
async function handleCtxUpload(fileList, targetDir = '') {
const files = Array.from(fileList || []);
_contextsLog.info(`upload: ${files.length} file(s), targetDir="${targetDir || '(root)'}"`);
@@ -1015,7 +1024,7 @@ async function handleCtxUpload(fileList, targetDir = '') {
const rejected = results.filter((r) => !r.ok);
for (const r of rejected) {
_contextsLog.warn('upload failed', r.name, r.reason);
- if (window.Monitor) (() => {})('library_file_upload', { error_message: r.reason });
+ if (window.Monitor) (() => {})('library_file_upload', { error_message: _ctxUploadErrorCode(r.reason) });
}
const extRejected = rejected.filter((r) => r.reason === 'ext');
const hiddenRejected = rejected.filter((r) => r.reason === 'hidden');
diff --git a/test/main/features/auto_tasks.test.ts b/test/main/features/auto_tasks.test.ts
index b2895969..2ca078ec 100644
--- a/test/main/features/auto_tasks.test.ts
+++ b/test/main/features/auto_tasks.test.ts
@@ -19,10 +19,12 @@ import * as fs from 'node:fs';
import * as path from 'node:path';
import {
autoTaskAttachmentsDir,
+ autoTaskDir,
autoTaskConfigFile,
chatAttachmentDir,
projectBindingsFile,
projectMetaFile,
+ userLocalRoot,
userRoot,
} from '../../../src/main/paths';
import {
@@ -452,6 +454,47 @@ describe('scheduler dispatch', () => {
task = await getTask(TEST_UID, taskId);
expect(task?.last_run_at).toBe(new Date(2026, 4, 23, 9, 0, 0).toISOString());
});
+
+ it('releases a claim and retries when marking last_run_at fails before dispatch', async () => {
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date(2026, 4, 22, 8, 30, 0));
+
+ const taskId = 'at_99999999';
+ const created = await createTask(TEST_UID, {
+ id: taskId,
+ content: 'daily retry',
+ schedule: { type: 'daily', hour: 9, minute: 0 },
+ });
+ expect(created.ok).toBe(true);
+ stopScheduler();
+
+ vi.setSystemTime(new Date(2026, 4, 22, 9, 0, 0));
+ const boundary = new Date(2026, 4, 22, 9, 0, 0);
+ const claimFile = path.join(userLocalRoot(TEST_UID), 'auto_task_claims', taskId, `${boundary.getTime()}.json`);
+ const taskDir = autoTaskDir(TEST_UID, taskId);
+
+ fs.chmodSync(taskDir, 0o500);
+ try {
+ await _onTimerFireForTest(TEST_UID, taskId);
+ } finally {
+ fs.chmodSync(taskDir, 0o700);
+ }
+
+ expect(autoRuntime.createConversation).not.toHaveBeenCalled();
+ expect(autoRuntime.send).not.toHaveBeenCalled();
+ expect(fs.existsSync(claimFile)).toBe(false);
+ let task = await getTask(TEST_UID, taskId);
+ expect(task?.last_run_at).toBeUndefined();
+
+ stopScheduler();
+ await _onTimerFireForTest(TEST_UID, taskId);
+
+ expect(autoRuntime.createConversation).toHaveBeenCalledTimes(1);
+ expect(autoRuntime.send).toHaveBeenCalledTimes(1);
+ expect(fs.existsSync(claimFile)).toBe(true);
+ task = await getTask(TEST_UID, taskId);
+ expect(task?.last_run_at).toBe(boundary.toISOString());
+ });
});
describe('isDue: one_time', () => {
diff --git a/test/main/features/users.test.ts b/test/main/features/users.test.ts
index a51b8532..543f01b7 100644
--- a/test/main/features/users.test.ts
+++ b/test/main/features/users.test.ts
@@ -225,7 +225,32 @@ describe('features/users › account uid', () => {
expect(fs.readFileSync(path.join(tmpDir, rec.user_id, 'local', 'config', 'marker.txt'), 'utf8')).toBe('kept');
const reg = JSON.parse(fs.readFileSync(path.join(tmpDir, 'users.json'), 'utf-8'));
expect(reg.current_user_id).toBe(rec.user_id);
- expect(reg.users.map((u: { user_id: string }) => u.user_id)).toEqual([rec.user_id]);
+ expect(reg.dev_current_user_id).toBe(users.ANONYMOUS_LOCAL_ID);
+ expect(reg.users.map((u: { user_id: string }) => u.user_id).sort()).toEqual([
+ rec.user_id,
+ users.ANONYMOUS_LOCAL_ID,
+ ]);
+ });
+
+ it('does not rewrite the dev pointer when prod adopts anonymous on login', async () => {
+ writeUsersJson({
+ current_user_id: 'anonymous',
+ dev_current_user_id: 'anonymous',
+ users: [{ user_id: 'anonymous', created_at: '2026-01-01T00:00:00' }],
+ });
+ const users = await import('../../../src/main/features/users');
+ users.initActiveUser({ defaultLocalId: users.ANONYMOUS_LOCAL_ID });
+ fs.writeFileSync(path.join(tmpDir, 'anonymous', 'local', 'config', 'marker.txt'), 'kept');
+
+ const rec = users.switchToAccountLocalId('A0653F11-9F05-4A8B-89CE-0026D809EAFC');
+
+ const reg = readUsersJson();
+ expect(reg.current_user_id).toBe(rec.user_id);
+ expect(reg.dev_current_user_id).toBe('anonymous');
+ expect(reg.users.map((u: { user_id: string }) => u.user_id).sort()).toEqual([
+ 'A0653F11-9F05-4A8B-89CE-0026D809EAFC',
+ 'anonymous',
+ ]);
});
it('rekeys auth-profiles when anonymous is renamed to the account uid', async () => {
@@ -317,7 +342,11 @@ describe('features/users › account uid', () => {
expect(fs.existsSync(path.join(tmpDir, 'A0653F11-9F05-4A8B-89CE-0026D809EAFC', 'local', 'config', 'account.json'))).toBe(true);
const reg = JSON.parse(fs.readFileSync(path.join(tmpDir, 'users.json'), 'utf-8'));
expect(reg.current_user_id).toBe('A0653F11-9F05-4A8B-89CE-0026D809EAFC');
- expect(reg.users).toEqual([{ user_id: 'A0653F11-9F05-4A8B-89CE-0026D809EAFC', created_at: '2026-01-01T00:00:00' }]);
+ expect(reg.dev_current_user_id).toBe(users.ANONYMOUS_LOCAL_ID);
+ expect(reg.users.map((u: { user_id: string }) => u.user_id).sort()).toEqual([
+ 'A0653F11-9F05-4A8B-89CE-0026D809EAFC',
+ users.ANONYMOUS_LOCAL_ID,
+ ]);
});
it('migrates a legacy logged-in 8-digit directory to account uid at startup', async () => {
@@ -371,7 +400,11 @@ describe('features/users › account uid', () => {
expect(fs.existsSync(path.join(tmpDir, 'A0653F11-9F05-4A8B-89CE-0026D809EAFC', 'local', 'config', 'account.json'))).toBe(true);
const reg = JSON.parse(fs.readFileSync(path.join(tmpDir, 'users.json'), 'utf-8'));
expect(reg.current_user_id).toBe('A0653F11-9F05-4A8B-89CE-0026D809EAFC');
- expect(reg.users).toEqual([{ user_id: 'A0653F11-9F05-4A8B-89CE-0026D809EAFC', created_at: '2026-01-01T00:00:00' }]);
+ expect(reg.dev_current_user_id).toBe(users.ANONYMOUS_LOCAL_ID);
+ expect(reg.users.map((u: { user_id: string }) => u.user_id).sort()).toEqual([
+ 'A0653F11-9F05-4A8B-89CE-0026D809EAFC',
+ users.ANONYMOUS_LOCAL_ID,
+ ]);
const raw = fs.readFileSync(path.join(tmpDir, 'A0653F11-9F05-4A8B-89CE-0026D809EAFC', 'local', 'config', 'auth-profiles.json'), 'utf8');
const json = localSecrets.decryptLocalSecret({
namespace: 'auth.profiles',