soja-cli 1.5.1 → 1.6.0

package/dist/application/finance.js

@@ -0,0 +1 @@
+export {};

package/dist/application/intake.js

@@ -0,0 +1 @@
+export {};

package/dist/application/services/task-service.js

@@ -30,6 +30,9 @@ const changesSchema = z.object({
     status: z.enum(TASK_STATUSES).optional(),
     assigneeId: z.string().nullable().optional(),
     requester: optionalText(80),
+    remunerated: z.boolean().optional(),
+    priceMinor: z.number().int().nonnegative().nullable().optional(),
+    currencyCode: z.string().regex(/^[A-Z]{3}$/).nullable().optional(),
     branch: optionalText(250),
     /** Bookkeeping for merges; changes are not shown in the timeline. */
     baseBranch: optionalText(250),
@@ -125,6 +128,10 @@ export class TaskService {
                 assigneeId,
                 creatorId: session.user.id,
                 requester: data.requester ?? null,
+                remunerated: false,
+                priceMinor: null,
+                externalApprovalStatus: null,
+                currencyCode: null,
                 branch: null,
                 baseBranch: null,
                 branchStart: null,
@@ -164,6 +171,23 @@ export class TaskService {
             patch.requester = data.requester;
             events.push({ type: 'task_updated', metadata: { field: 'requester', from: task.requester, to: data.requester } });
         }
+        const nextRemunerated = data.remunerated ?? task.remunerated;
+        const nextPrice = data.remunerated === false && data.priceMinor === undefined ? null : data.priceMinor === undefined ? task.priceMinor : data.priceMinor;
+        const nextCurrency = data.remunerated === false && data.currencyCode === undefined ? null : data.currencyCode === undefined ? task.currencyCode : data.currencyCode;
+        if (nextRemunerated && (nextPrice === null || nextCurrency === null))
+            throw new ValidationError('A paid task needs a price and currency.');
+        if (!nextRemunerated && (nextPrice !== null || nextCurrency !== null))
+            throw new ValidationError('Remove the price and currency before marking a task unpaid.');
+        if (nextRemunerated !== task.remunerated || nextPrice !== task.priceMinor || nextCurrency !== task.currencyCode) {
+            patch.remunerated = nextRemunerated;
+            patch.priceMinor = nextPrice;
+            patch.currencyCode = nextCurrency;
+            events.push({ type: 'task_updated', metadata: {
+                    field: 'price',
+                    from: task.priceMinor === null ? null : `${task.priceMinor} ${task.currencyCode ?? ''}`.trim(),
+                    to: nextPrice === null ? null : `${nextPrice} ${nextCurrency ?? ''}`.trim(),
+                } });
+        }
         if (changed(data.branch, task.branch)) {
             patch.branch = data.branch;
             events.push({ type: 'task_updated', metadata: { field: 'branch', from: task.branch, to: data.branch } });
@@ -289,7 +313,7 @@ export class TaskService {
     async resolve(session, target) {
         if (typeof target === 'object') {
             const task = await this.repos.tasks.findById(target.id);
-            if (task && task.workspaceId === session.workspace.id)
+            if (task && task.workspaceId === session.workspace.id && task.externalApprovalStatus !== 'pending' && task.externalApprovalStatus !== 'rejected')
                 return task;
             throw new NotFoundError('That task no longer exists.');
         }
@@ -298,7 +322,7 @@ export class TaskService {
             throw new ValidationError(`“${String(target)}” is not a task ID.`, { hint: 'Use something like SOJA-12.' });
         }
         const task = await this.repos.tasks.findByNumber(session.workspace.id, number);
-        if (!task)
+        if (!task || task.externalApprovalStatus === 'pending' || task.externalApprovalStatus === 'rejected')
             throw new NotFoundError(`${formatTaskRef(number)} does not exist in ${session.workspace.name}.`);
         return task;
     }

package/dist/application/services/workspace-service.js

@@ -44,7 +44,7 @@ export class WorkspaceService {
     }
     async members(session) {
         const members = await this.repos.workspaces.listMembers(session.workspace.id);
-        return members.map(({ id, username, displayName, role }) => ({ id, username, displayName, role }));
+        return members.map(({ id, username, displayName, role, designated }) => ({ id, username, displayName, role, designated: role === 'owner' || Boolean(designated) }));
     }
     async findMember(session, username) {
         const normalized = username.trim().replace(/^@/, '').toLowerCase();
@@ -54,6 +54,9 @@ export class WorkspaceService {
         }
         return member;
     }
+    async setDesignated(session, userId, designated) {
+        await this.repos.workspaces.setDesignated(session.workspace.id, userId, designated);
+    }
     /**
      * Adds a developer to the workspace. In local mode developers are plain
      * records (no login), so an unknown username creates one.
@@ -67,7 +70,7 @@ export class WorkspaceService {
                 throw new ConflictError(`@${username} is already in ${session.workspace.name}.`);
             }
             await this.repos.workspaces.addMember({ workspaceId: session.workspace.id, userId: user.id, role: 'member' });
-            return { id: user.id, username: user.username, displayName: user.displayName, role: 'member' };
+            return { id: user.id, username: user.username, displayName: user.displayName, role: 'member', designated: false };
         });
     }
 }

package/dist/application/timeline.js

@@ -74,6 +74,8 @@ export function describe(item, lookups) {
                     return to ? `set requester to ${to}` : 'cleared the requester';
                 case 'branch':
                     return to ? `linked branch ${to}` : 'unlinked the branch';
+                case 'price':
+                    return to ? `set ticket price to ${to}` : 'removed the ticket price';
             }
         }
     }

package/dist/cli/commands/workspace.js

@@ -13,7 +13,9 @@ export async function workspaceCommand(args) {
         return create(rest);
     if (sub === 'add' || sub === 'add-member')
         return addMember(rest);
-    throw new ValidationError(`Unknown workspace command “${sub}”.`, { hint: 'Try: list, create <name>, add <username>, use <workspace>.' });
+    if (sub === 'designate')
+        return designate(rest);
+    throw new ValidationError(`Unknown workspace command “${sub}”.`, { hint: 'Try: list, create <name>, add <username>, designate <username>.' });
 }
 async function list() {
     await withSession(async (services, session) => {
@@ -53,3 +55,12 @@ async function addMember(args) {
         success(`@${member.username} joined ${bold(session.workspace.name)}`);
     });
 }
+async function designate(args) {
+    const { values, positionals } = parseCommand(args, { remove: { type: 'boolean', short: 'r' } });
+    const username = requireArg(positionals[0], 'workspace member', 'soja workspace designate angel');
+    await withSession(async (services, session) => {
+        const member = await services.workspaces.findMember(session, username);
+        await services.workspaces.setDesignated(session, member.id, !values.remove);
+        success(`${values.remove ? 'Removed designate access from' : 'Designated'} @${member.username} ${values.remove ? 'in ' + bold(session.workspace.name) : 'for ' + bold(session.workspace.name)}`);
+    });
+}

package/dist/cli/output.js

@@ -51,6 +51,7 @@ export function taskLine(task, options = {}, columns = process.stdout.columns ||
         used += 11;
     }
     const room = Math.max(12, columns - used - 2);
-    parts.push(task.title.length > room ? `${task.title.slice(0, room - 1)}${symbols.ellipsis}` : task.title);
+    const title = `${task.remunerated ? '$ ' : ''}${task.title}`;
+    parts.push(title.length > room ? `${title.slice(0, room - 1)}${symbols.ellipsis}` : title);
     return `  ${parts.join('')}`;
 }

package/dist/data/local/tasks.js

@@ -44,6 +44,9 @@ export class LocalTaskRepository {
     }
     async list(query) {
         const conditions = [eq(tasks.workspaceId, query.workspaceId)];
+        const externallyVisible = or(isNull(tasks.externalApprovalStatus), eq(tasks.externalApprovalStatus, 'approved'));
+        if (externallyVisible)
+            conditions.push(externallyVisible);
         if (query.assigneeId)
             conditions.push(eq(tasks.assigneeId, query.assigneeId));
         if (query.projectId)
@@ -79,10 +82,11 @@ export class LocalTaskRepository {
         return task;
     }
     async countByProjectAndStatus(workspaceId) {
+        const externallyVisible = or(isNull(tasks.externalApprovalStatus), eq(tasks.externalApprovalStatus, 'approved'));
         return this.db
             .select({ projectId: tasks.projectId, status: tasks.status, count: count() })
             .from(tasks)
-            .where(and(eq(tasks.workspaceId, workspaceId), isNull(tasks.archivedAt)))
+            .where(and(eq(tasks.workspaceId, workspaceId), isNull(tasks.archivedAt), ...(externallyVisible ? [externallyVisible] : [])))
             .groupBy(tasks.projectId, tasks.status);
     }
     async delete(id) {

package/dist/data/local/workspaces.js

@@ -25,7 +25,7 @@ export class LocalWorkspaceRepository {
     }
     async listForUser(userId) {
         const rows = await this.db
-            .select({ workspace: workspaces, role: workspaceMembers.role })
+            .select({ workspace: workspaces, role: workspaceMembers.role, designated: workspaceMembers.designated })
             .from(workspaceMembers)
             .innerJoin(workspaces, eq(workspaces.id, workspaceMembers.workspaceId))
             .where(eq(workspaceMembers.userId, userId))
@@ -45,11 +45,14 @@ export class LocalWorkspaceRepository {
     }
     async listMembers(workspaceId) {
         const rows = await this.db
-            .select({ user: users, role: workspaceMembers.role })
+            .select({ user: users, role: workspaceMembers.role, designated: workspaceMembers.designated })
             .from(workspaceMembers)
             .innerJoin(users, eq(users.id, workspaceMembers.userId))
             .where(eq(workspaceMembers.workspaceId, workspaceId))
             .orderBy(asc(users.username));
-        return rows.map((row) => ({ ...row.user, role: row.role }));
+        return rows.map((row) => ({ ...row.user, role: row.role, designated: row.role === 'owner' || row.designated }));
+    }
+    async setDesignated(workspaceId, userId, designated) {
+        await this.db.update(workspaceMembers).set({ designated }).where(and(eq(workspaceMembers.workspaceId, workspaceId), eq(workspaceMembers.userId, userId)));
     }
 }

package/dist/data/sync/engine.js

@@ -3,7 +3,7 @@ import { formatTaskRef, isProvisional, TASK_REF_PREFIX } from '../../domain/task
 import { OfflineError } from '../remote/api-client.js';
 import { isChatOp } from './store.js';
 const BATCH = 100;
-const TASK_FIELDS = new Set(['title', 'description', 'projectId', 'type', 'priority', 'status', 'assigneeId', 'requester', 'branch', 'baseBranch', 'branchStart']);
+const TASK_FIELDS = new Set(['title', 'description', 'projectId', 'type', 'priority', 'status', 'assigneeId', 'requester', 'remunerated', 'priceMinor', 'currencyCode', 'branch', 'baseBranch', 'branchStart']);
 /** Server task view → stored task row (presentation fields are dropped by the store). */
 const toTask = (view) => view;
 const emptyReport = () => ({

package/dist/data/sync/finance.js

@@ -0,0 +1,15 @@
+export class ReplicaFinanceService {
+    context;
+    constructor(context) {
+        this.context = context;
+    }
+    summary(session) {
+        return this.context.api.get(`/v1/workspaces/${session.workspace.id}/finance`);
+    }
+    async configureCurrency(session, currencyCode) {
+        await this.context.api.request('PUT', `/v1/workspaces/${session.workspace.id}/finance/currency`, { currencyCode });
+    }
+    async setMySalary(session, input) {
+        await this.context.api.request('PUT', `/v1/workspaces/${session.workspace.id}/finance/salary`, input);
+    }
+}

package/dist/data/sync/index.js

@@ -7,6 +7,8 @@ import { TaskService } from '../../application/services/task-service.js';
 import { createLocalRepositories } from '../local/index.js';
 import { LiveConnection } from '../remote/live.js';
 import { ReplicaChatService } from './chat.js';
+import { ReplicaFinanceService } from './finance.js';
+import { ReplicaIntakeService } from './intake.js';
 import { LocalImporter } from './importer.js';
 import { SyncEngine } from './engine.js';
 import { ReplicaProjectService, ReplicaSessionService, ReplicaTaskService, ReplicaWorkspaceService } from './services.js';
@@ -83,6 +85,8 @@ export function createReplicaServices(api, handle, config, git, gitConsole, WebS
         projects,
         tasks,
         chat: new ReplicaChatService(context, tasks),
+        finance: new ReplicaFinanceService(context),
+        intake: new ReplicaIntakeService(context),
         ...(localDatabaseFile ? { importer: new LocalImporter(localDatabaseFile, config, api, store, engine) } : {}),
         git: new GitWorkflowService(tasks, projects, git),
         folders: new FolderService(config),

package/dist/data/sync/intake.js

@@ -0,0 +1,27 @@
+export class ReplicaIntakeService {
+    context;
+    constructor(context) {
+        this.context = context;
+    }
+    configure(session, projectId, input) {
+        return this.context.api.request('PUT', `${this.base(session)}/projects/${projectId}/intake`, input);
+    }
+    rotateSecret(session, projectId) {
+        return this.context.api.request('POST', `${this.base(session)}/projects/${projectId}/intake/secret`);
+    }
+    exportContract(session, projectId) {
+        return this.context.api.get(`${this.base(session)}/projects/${projectId}/intake/export`);
+    }
+    reviewQueue(session, projectId) {
+        return this.context.api.get(`${this.base(session)}/projects/${projectId}/intake/requests`);
+    }
+    decide(session, projectId, taskId, input) {
+        return this.context.api.request('POST', `${this.base(session)}/projects/${projectId}/intake/requests/${taskId}/decision`, input);
+    }
+    async revoke(session, projectId) {
+        await this.context.api.delete(`${this.base(session)}/projects/${projectId}/intake`);
+    }
+    base(session) {
+        return `/v1/workspaces/${session.workspace.id}`;
+    }
+}

package/dist/data/sync/services.js

@@ -102,7 +102,7 @@ export class ReplicaWorkspaceService {
     }
     async members(session) {
         const members = await this.context.repos.workspaces.listMembers(session.workspace.id);
-        return members.map(({ id, username, displayName, role }) => ({ id, username, displayName, role }));
+        return members.map(({ id, username, displayName, role, designated }) => ({ id, username, displayName, role, designated: role === 'owner' || Boolean(designated) }));
     }
     async findMember(session, username) {
         const normalized = username.trim().replace(/^@/, '').toLowerCase();
@@ -116,6 +116,11 @@ export class ReplicaWorkspaceService {
         await this.context.store.upsertMember(session.workspace.id, member);
         return member;
     }
+    async setDesignated(session, userId, designated) {
+        const members = await online('Updating workspace designates', () => this.context.api.request(designated ? 'POST' : 'DELETE', `/v1/workspaces/${session.workspace.id}/designates/${userId}`));
+        for (const member of members)
+            await this.context.store.upsertMember(session.workspace.id, member);
+    }
 }
 export class ReplicaProjectService {
     context;
@@ -166,7 +171,7 @@ export class ReplicaProjectService {
         return this.local.get(session, project.id);
     }
 }
-const CHANGE_FIELDS = ['title', 'description', 'projectId', 'type', 'priority', 'status', 'assigneeId', 'requester', 'branch', 'baseBranch', 'branchStart'];
+const CHANGE_FIELDS = ['title', 'description', 'projectId', 'type', 'priority', 'status', 'assigneeId', 'requester', 'remunerated', 'priceMinor', 'currencyCode', 'branch', 'baseBranch', 'branchStart'];
 /**
  * Tasks in remote mode: read and written in the local replica (instant, works
  * offline), with every write queued as an operation for the server.

package/dist/data/sync/store.js

@@ -4,7 +4,7 @@ export const isChatOp = (type) => !type.startsWith('task.');
 /** Task fields as stored; server views carry extra presentation fields we drop. */
 const TASK_COLUMNS = [
     'id', 'number', 'workspaceId', 'projectId', 'title', 'description', 'type', 'priority', 'status', 'assigneeId',
-    'creatorId', 'requester', 'branch', 'baseBranch', 'branchStart', 'createdAt', 'updatedAt', 'startedAt', 'completedAt', 'archivedAt',
+    'creatorId', 'requester', 'remunerated', 'priceMinor', 'currencyCode', 'externalApprovalStatus', 'branch', 'baseBranch', 'branchStart', 'createdAt', 'updatedAt', 'startedAt', 'completedAt', 'archivedAt',
 ];
 const pickTask = (task) => Object.fromEntries(TASK_COLUMNS.map((column) => [column, task[column]]));
 /**
@@ -30,8 +30,8 @@ export class ReplicaStore {
         await this.upsertUser(member);
         await this.db
             .insert(workspaceMembers)
-            .values({ workspaceId, userId: member.id, role: member.role })
-            .onConflictDoUpdate({ target: [workspaceMembers.workspaceId, workspaceMembers.userId], set: { role: member.role } });
+            .values({ workspaceId, userId: member.id, role: member.role, designated: member.designated ?? member.role === 'owner' })
+            .onConflictDoUpdate({ target: [workspaceMembers.workspaceId, workspaceMembers.userId], set: { role: member.role, designated: member.designated ?? member.role === 'owner' } });
     }
     /** Server projects have no local path; the one this machine linked is kept. */
     async upsertProject(project) {

package/dist/database/migrations/0007_finances.sql

@@ -0,0 +1,5 @@
+ALTER TABLE tasks ADD COLUMN remunerated INTEGER NOT NULL DEFAULT 0 CHECK (remunerated IN (0, 1));--> statement-breakpoint
+ALTER TABLE tasks ADD COLUMN price_minor INTEGER CHECK (price_minor IS NULL OR price_minor >= 0);--> statement-breakpoint
+ALTER TABLE tasks ADD COLUMN currency_code TEXT CHECK (currency_code IS NULL OR currency_code GLOB '[A-Z][A-Z][A-Z]');
+--> statement-breakpoint
+ALTER TABLE workspace_members ADD COLUMN designated INTEGER NOT NULL DEFAULT 0 CHECK (designated IN (0, 1));

package/dist/database/migrations/0008_finances_designates.sql

@@ -0,0 +1,44 @@
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_tasks` (
+	`id` text PRIMARY KEY NOT NULL,
+	`number` integer NOT NULL,
+	`workspace_id` text NOT NULL,
+	`project_id` text,
+	`title` text NOT NULL,
+	`description` text,
+	`type` text NOT NULL,
+	`priority` text NOT NULL,
+	`status` text NOT NULL,
+	`assignee_id` text,
+	`creator_id` text NOT NULL,
+	`requester` text,
+	`remunerated` integer DEFAULT false NOT NULL,
+	`price_minor` integer,
+	`currency_code` text,
+	`branch` text,
+	`base_branch` text,
+	`branch_start` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	`started_at` integer,
+	`completed_at` integer,
+	`archived_at` integer,
+	FOREIGN KEY (`workspace_id`) REFERENCES `workspaces`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE set null,
+	FOREIGN KEY (`assignee_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE set null,
+	FOREIGN KEY (`creator_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action,
+	CONSTRAINT "tasks_type" CHECK(type IN ('bug', 'feature', 'improvement', 'maintenance', 'infra', 'refactor', 'research', 'chore')),
+	CONSTRAINT "tasks_priority" CHECK(priority IN ('none', 'low', 'medium', 'high', 'urgent')),
+	CONSTRAINT "tasks_status" CHECK(status IN ('backlog', 'todo', 'in_progress', 'review', 'blocked', 'done', 'cancelled')),
+	CONSTRAINT "tasks_price_nonnegative" CHECK(price_minor IS NULL OR price_minor >= 0),
+	CONSTRAINT "tasks_remuneration_fields" CHECK((remunerated = 0 AND price_minor IS NULL AND currency_code IS NULL) OR (remunerated = 1 AND price_minor IS NOT NULL AND currency_code IS NOT NULL))
+);
+--> statement-breakpoint
+INSERT INTO `__new_tasks`("id", "number", "workspace_id", "project_id", "title", "description", "type", "priority", "status", "assignee_id", "creator_id", "requester", "remunerated", "price_minor", "currency_code", "branch", "base_branch", "branch_start", "created_at", "updated_at", "started_at", "completed_at", "archived_at") SELECT "id", "number", "workspace_id", "project_id", "title", "description", "type", "priority", "status", "assignee_id", "creator_id", "requester", "remunerated", "price_minor", "currency_code", "branch", "base_branch", "branch_start", "created_at", "updated_at", "started_at", "completed_at", "archived_at" FROM `tasks`;--> statement-breakpoint
+DROP TABLE `tasks`;--> statement-breakpoint
+ALTER TABLE `__new_tasks` RENAME TO `tasks`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
+CREATE UNIQUE INDEX `tasks_workspace_number` ON `tasks` (`workspace_id`,`number`);--> statement-breakpoint
+CREATE INDEX `tasks_workspace_status` ON `tasks` (`workspace_id`,`status`);--> statement-breakpoint
+CREATE INDEX `tasks_assignee` ON `tasks` (`assignee_id`);--> statement-breakpoint
+CREATE INDEX `tasks_project` ON `tasks` (`project_id`);--> statement-breakpoint

package/dist/database/migrations/0009_external_approval.sql

@@ -0,0 +1 @@
+ALTER TABLE `tasks` ADD `external_approval_status` text;